From nobody Thu Sep 11 21:11:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EEBFC001B0 for ; Tue, 8 Aug 2023 19:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236084AbjHHTVI (ORCPT ); Tue, 8 Aug 2023 15:21:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236097AbjHHTUo (ORCPT ); Tue, 8 Aug 2023 15:20:44 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1509D59C7 for ; Tue, 8 Aug 2023 09:44:07 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3fe1a17f983so50053705e9.3 for ; Tue, 08 Aug 2023 09:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691513045; x=1692117845; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=J6m3K/inEtRmdGEBBt/pEMpMfJWtxVrjJEBC47w+pHA=; b=Q66y5OsqazL/NZP2PQHViU2OkzU5RD4Gz4TC2r1C2MSl5aRgpQ7mAowcG2C/sJYMnd NxiFGQZCB1GL0dTMMLRlnr4A/MkxQnf0BbJz6d6Naa8LQEMwcxD3Lky9torH292+rpcv O7dpfE8eNeEJJt1U02MDJIfZhj9uJgxtLMepu5FAFSebfHsNYpt7rZQ7bK9X/6Qds7mg XLIDNi1Jt9E1zZHg9NE4T0XlLXqPFvoMWit7w85sKkf2MTxxs4Se3+AUu7Phy1KejlAb Sx5TEyzWqzdxMQSvuaM9FwMMTgh84dNS+2CNnAsY8nbi3RTwUCJ/gbwcP1rRdTnZ1Z1j Dnow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691513045; x=1692117845; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J6m3K/inEtRmdGEBBt/pEMpMfJWtxVrjJEBC47w+pHA=; b=HJRea8AleOU0cEbR8oGynHd3pdYBIlg2ILfxLrUutPLXIj1FHDvJ5rtLhcCDNujQYY hWKZZ5rQYifQg7gx/ZOdyjc5eegQLaYGSMVeIxMhkKZVXePv0nyn9UsRWf8X3IJnMarq uYCUvTemXcMSmsxCdedHxOk753BOQF2LhmEvhseL9VB+0g/uFmguk8pBIyHZKSyhxIMP IkUvMD/AscR7DQ11fMcbAshE5ZiuhkOfkjIjrrTkF8nX3N7iBoBKBL8UqTGHbHu2CAeH tP1VrjumIs1n+qGf8I+p/ngMcr6DpwT3twnL6PN83IL6ja6TLUWVp6NaI9zRHhBKrhvj 3hfg== X-Gm-Message-State: AOJu0YySWSfBWnpSXOUZylxV6DBIAhs5viJt6EuvxR5DVjRnH/lg2FQK tvwBw0fu94Qm+V8OFMmMYwixLzT+LAKsE8c7zNE= X-Google-Smtp-Source: AGHT+IHxDCh1uiQfUmmrydV7nAhXgfZ1Kwvcz0RMY0OKmPWNtnQhD201bB37ZY0n1WH7gHW98TyYVg== X-Received: by 2002:a05:6512:ad5:b0:4fb:9050:1d92 with SMTP id n21-20020a0565120ad500b004fb90501d92mr8131994lfu.51.1691483163361; Tue, 08 Aug 2023 01:26:03 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id t13-20020a19ad0d000000b004fbae18984dsm1787087lfc.255.2023.08.08.01.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 01:26:02 -0700 (PDT) From: Linus Walleij Date: Tue, 08 Aug 2023 10:25:55 +0200 Subject: [PATCH 1/2] csky: Cast argument to virt_to_pfn() to (void *) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230808-csky-virt-to-phys-v1-1-ac727f8def2f@linaro.org> References: <20230808-csky-virt-to-phys-v1-0-ac727f8def2f@linaro.org> In-Reply-To: <20230808-csky-virt-to-phys-v1-0-ac727f8def2f@linaro.org> To: Vineet Gupta , Guo Ren Cc: linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The virt_to_pfn() function takes a (void *) as argument, fix this up to avoid exploiting the unintended polymorphism of virt_to_pfn. Signed-off-by: Linus Walleij --- arch/arc/include/asm/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arc/include/asm/page.h b/arch/arc/include/asm/page.h index e43fe27ec54d..02b53ad811fb 100644 --- a/arch/arc/include/asm/page.h +++ b/arch/arc/include/asm/page.h @@ -108,7 +108,7 @@ extern int pfn_valid(unsigned long pfn); =20 #else /* CONFIG_HIGHMEM */ =20 -#define ARCH_PFN_OFFSET virt_to_pfn(CONFIG_LINUX_RAM_BASE) +#define ARCH_PFN_OFFSET virt_to_pfn((void *)CONFIG_LINUX_RAM_BASE) =20 #endif /* CONFIG_HIGHMEM */ =20 --=20 2.34.1 From nobody Thu Sep 11 21:11:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A0E5C001B0 for ; Tue, 8 Aug 2023 16:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233427AbjHHQrx (ORCPT ); Tue, 8 Aug 2023 12:47:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230512AbjHHQqi (ORCPT ); Tue, 8 Aug 2023 12:46:38 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58514170F8 for ; Tue, 8 Aug 2023 08:56:40 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-523100882f2so7029207a12.2 for ; Tue, 08 Aug 2023 08:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691510170; x=1692114970; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bRPNurCVUK+kZN7q7E8TsOpZ2X9nLclQ5Lcqn45M43Y=; b=D3+x+5n0GK3u4IvyihWkyCDxlrk5NlbF30zhFFSecLGrMNk+OEE3v4EwF9AfA1eH28 aWko4PAPAhq3crmSkM4DS9FaQXVn59L/RJ2o0WbCUeXbJQD80e542cRGjBKeThWKzDp5 RzdGlI0QNdni3iyzCyR0dA+N850UqCvO3wH+CivA8vWzB1Ad4ShikNMWhkDhNImk++2a aVGQd/lEfDlS+G0RSjnqQ3RrtwWiUX4852zTl99SWCCAvI9tdzFZa1hDYkViTWMTbPLr FYbgStzldNz+GSaLyS37jAl3hfVSMLJzdvkC2z/k/Pqe/VgW1WLWi/GHMm76YEA2c5pt mSSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691510170; x=1692114970; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bRPNurCVUK+kZN7q7E8TsOpZ2X9nLclQ5Lcqn45M43Y=; b=ilAITqXFVU4dSf0PSK1SNapD2fDIq/3i4tztPNrBX1c7GgqX7xGEBdX93gNbH44FZD wpyux/k48xJAco5Tqz0HBeYDW8FZ4q77iY7IdocU+uPQ9j010dwO9TxOIGCjEdbyKI7l 9BQpyJHUwElrAAwFHijrJ9/vIh+x7H2RTaE6W+ogkXLEAvImMZgL6pAm3Co9sWQk0Hj2 p05eU0LhshPEgBEFvDTzpEEhf3kgNoW8ZC93Ot7DEQEKsAxz/I5iYDe32hR+cAEtpMid gO+KvYYwf4kv0A/Kg9FPJANDAGqLUc3WT+Ml7K0QQbheanwoWW33N/If1cFzbs+BKhtV iajQ== X-Gm-Message-State: AOJu0Yz2L8MjDq9O5urZPyEMNNSKjgdp7Hwms6rYDjT5RNMIUklqaDcZ BN+84SBwotEH56j+tJMrDai7JSbTlmZBZ3rFtTk= X-Google-Smtp-Source: AGHT+IFcKitgCUMDjTXmYFgGTjati7nhjKf1RmPJEXoKcYA78VEzCeeOhe2OLLR3Pt79LBJFdpGryg== X-Received: by 2002:a05:6512:358b:b0:4fd:d4b4:faba with SMTP id m11-20020a056512358b00b004fdd4b4fabamr7004297lfr.51.1691483164349; Tue, 08 Aug 2023 01:26:04 -0700 (PDT) Received: from [127.0.1.1] ([85.235.12.238]) by smtp.gmail.com with ESMTPSA id t13-20020a19ad0d000000b004fbae18984dsm1787087lfc.255.2023.08.08.01.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 01:26:03 -0700 (PDT) From: Linus Walleij Date: Tue, 08 Aug 2023 10:25:56 +0200 Subject: [PATCH 2/2] csky: Make pfn accessors static inlines MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230808-csky-virt-to-phys-v1-2-ac727f8def2f@linaro.org> References: <20230808-csky-virt-to-phys-v1-0-ac727f8def2f@linaro.org> In-Reply-To: <20230808-csky-virt-to-phys-v1-0-ac727f8def2f@linaro.org> To: Vineet Gupta , Guo Ren Cc: linux-snps-arc@lists.infradead.org, linux-kernel@vger.kernel.org, linux-csky@vger.kernel.org, Linus Walleij X-Mailer: b4 0.12.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Making virt_to_pfn() a static inline taking a strongly typed (const void *) makes the contract of a passing a pointer of that type to the function explicit and exposes any misuse of the macro virt_to_pfn() acting polymorphic and accepting many types such as (void *), (unitptr_t) or (unsigned long) as arguments without warnings. For symmetry to the same thing with pfn_to_virt(). In order to do this we move the virt_to_phys() and phys_to_virt() below the definitions of the __pa() and __va() macros so it compiles. The macro version was also able to do recursive symbol resolution. Signed-off-by: Linus Walleij --- arch/csky/include/asm/page.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/csky/include/asm/page.h b/arch/csky/include/asm/page.h index b23e3006a9e0..80da7e96a8fa 100644 --- a/arch/csky/include/asm/page.h +++ b/arch/csky/include/asm/page.h @@ -34,9 +34,6 @@ =20 #include =20 -#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) -#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) - #define virt_addr_valid(kaddr) ((void *)(kaddr) >=3D (void *)PAGE_OFFSET = && \ (void *)(kaddr) < high_memory) =20 @@ -80,6 +77,16 @@ extern unsigned long va_pa_offset; =20 #define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x), 0)) =20 +static inline unsigned long virt_to_pfn(const void *kaddr) +{ + return __pa(kaddr) >> PAGE_SHIFT; +} + +static inline void * pfn_to_virt(unsigned long pfn) +{ + return __va(pfn) << PAGE_SHIFT; +} + #define MAP_NR(x) PFN_DOWN((unsigned long)(x) - PAGE_OFFSET - \ PHYS_OFFSET_OFFSET) #define virt_to_page(x) (mem_map + MAP_NR(x)) --=20 2.34.1