Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
From:   Brian Cain <bcain@quicinc.com>
To:     Thomas Huth <thuth@redhat.com>, Arnd Bergmann <arnd@arndb.de>,
        "linux-hexagon@vger.kernel.org" <linux-hexagon@vger.kernel.org>
CC:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Oleg Nesterov <oleg@redhat.com>
Subject: RE: [PATCH] hexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from uapi
 header
Thread-Topic: [PATCH] hexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from uapi
 header
Thread-Index: AQHaB//2OERsbOjxskupUbp44aavt7CQ3Acw
Date:   Wed, 29 Nov 2023 03:42:24 +0000
Message-ID: <SN6PR02MB4205BBAD065D3063745AE0B9B883A@SN6PR02MB4205.namprd02.prod.outlook.com>
References: <20231026113114.195854-1-thuth@redhat.com>
In-Reply-To: <20231026113114.195854-1-thuth@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?tboBqD70SHZalikLwY0NLhtZbSJGSISm6VK79hFgSV3aLV6NVc0T0JFjkGQT?=
 =?us-ascii?Q?yQwMflzVzbQSANWw1+f9LJZlivVWo22qjeU7dYv+o8JTMmH/qxx5Y4QL8tL3?=
 =?us-ascii?Q?AHv0GFc5W5DOnbxc9x+TTrn4T9x6VAmmqAF67yp3cPYMg0dGEsnN2Z4Zm9CZ?=
 =?us-ascii?Q?9wJHHnl3kO8Zb+qR0SwE5L1aaoG91n6uWCGWz6vY4tLF9xXtHw7k/H5yuExU?=
 =?us-ascii?Q?22tbhx/urJSSf9DvGnb2kC3oGAcdShovAxkGumh5M1y9f0map3II7sPlRM6x?=
 =?us-ascii?Q?MkuCTKhFJWy4w/QHwb8Cc5RabFvY7U3mIv5XegI7ecqzl+/8jmrOx6eob/jY?=
 =?us-ascii?Q?wU/AtJW4OMN9rGp6QpYwomUkKD+3GyZUU3Uz8/iHkeOiTTlVqUHKHi/p+ZIi?=
 =?us-ascii?Q?yqAFwVeqh2NjyqQ9IGpiU4DbDMlwowt1csYHfvloqMbNhkz93mpOdsPewOrX?=
 =?us-ascii?Q?di5g7asSXdDc0mUk//bAYZaW1HZpKVOwB/6sTfNzr+AwvTaqcd3CaBswEuHJ?=
 =?us-ascii?Q?k66ptCeg8410YGfePOb/Uen6+1nQ2dD73RDiagUgei0i4f4p/TcFs7NabKvB?=
 =?us-ascii?Q?Dir/ZnQ1OZ5nwzt6utwk2U5NFv9+9v5wkMUkCx5JYPgnulY5RKKM38wA9wBZ?=
 =?us-ascii?Q?xcTQ6jDZwuo/ttI/wSHR8CYKj5ICDyEXCoiiU+kp6fv/RSyR6g3PqCl12y5X?=
 =?us-ascii?Q?e+hsOCNv3en+RxfALkfTgObE4gUm58sQvWLhT2ZUtBZtDL0+2M18PZTEUUJ2?=
 =?us-ascii?Q?KyNkWq66Ou0RqNF2BVg/T4NJ7DQCnVWYCO1Y/wKiuoY2qpT38DZO/QGZbR49?=
 =?us-ascii?Q?U1cfPJ5AyRQvmUByERzFbG7dq5eTdqEgTcKWasg4iLoZHjv1FHj7BGgV6cvD?=
 =?us-ascii?Q?2vzEkbgiXWlHss4IvYKrqw4Zewdnr10L879Byk9YGAKE6akbUlXCiePQeUlf?=
 =?us-ascii?Q?+PoSDH1u9YSV8P6fHHL6ZKP4DuIBqXfu5jg12nmvU2AtCBsdtjaS31lWBLms?=
 =?us-ascii?Q?pydd2Yq6U+Ncsv4o1OIT5BBrfkrJrZ8OovNGtHObrcxP/OMSjd7Rfh5mdzlR?=
 =?us-ascii?Q?JcAWdOJV/7CowzsExo+lUeylNEpx9J2edRFT0KD1715w4GXxHcQvPTxq4Kv0?=
 =?us-ascii?Q?+tIRp+gBBWvD8E6Jlo0npnKR7Qm8yRphkNn1HWOR4jTdyWpi0yMtpVm2lUML?=
 =?us-ascii?Q?bUTn6nGf/t1/NJfQv8i5L0zMJ3fvsPExOZVD1RuUfdDJbrN03+gykBV5jjcL?=
 =?us-ascii?Q?PeZrV+OUfqFfPOPIiJ8IQAMsRvVlrMwGFo+HGyylDLwiNsvCf3bnNNAw+VE4?=
 =?us-ascii?Q?tUkscGTNVXryc2hD2XgBdnxHqrrsMrwaawzkg+s4+Z3K3w0GD0VhvYVY1GOg?=
 =?us-ascii?Q?axU6IwmV4iXrVsr6ilqQkQAO3FUKVKu3OdevjcwBqQMiMjzAwfShTh8uLaPY?=
 =?us-ascii?Q?KnPlIKQb9zlLbuvwassAaBeYdWuiHEyCWk9IfI0ehHn2aTs4UUXLmIx/uFLE?=
 =?us-ascii?Q?PWZ09CCzV0NYNXYDig53M+Tt6K3UU26fEq1ixfAEzmU96JWwh90FNegjcqRh?=
 =?us-ascii?Q?LbPQEk0HDp8bDICjq7U=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: o+fL+OmoBtnw3oVYGYL+hO4f/fCj9xVG7qeqGAgPCKO8tsOKuOYo9sIBbBFWo3MLz81j7iovbNds1UZgbZjINY5RkYMsSVDfz6YoLTEBFh2dl2oGOMHrXUpuN7plFSzU6+1Vpdt9GHqZxge7crcM97zbJU99+cfXfU3engZgPUX4Ch+yQhsDo3gikmupR2LULMhdecqiS4tqrfeanzno2d8afHMf3oJ8aQfBdNr0f4laKKUtOD5u1TQyziL1Y+e3/jOks8oxDXytoC2pcEzMA8mOABN2vtgBxOIlt+9iZVKEE8q8bNqaoA1BeVMMyAMKc8PbNf5TVoh3KEErakzSVtzfu0m7O3cPyxOsF4koIVw18WMTIoTeGI80cCHjm9McMCrqDKO8UlA+pRlff9Aj1XSUV8Uv4cdGyh0S34WKoKyBNImvGtC/GymHF0fWZgMqgf1pD4lbkvXhOq0CouJ/V4cZHeiGhrScIHPP6V05BeDaANBpnMrXweYwvk45oqJhWuZKT0Xq0Q7wFKCgRctZdoWDlg2xukm0QOTyTQp66MGZjI3yHJsY3W9bHeMPQ+tQLeb7y6TcIEyxFDJL60pb6Fj2GzxqfGox1EpA7immUYaZoiklgFclMjlBHvkY8501SnVLh4a3k1fKqwnlPRp8tvQQHh1UDJVlUEgJXOM1xotu2TzlV/4XeCLchiMpHJFUryI/OGBUsJtbj5IOkjSu3plhfu5RgvpsD4K1qPbty+2eDyTcIYsSqROtI/d/fsXGnODrnMWU+q6Abhn7irwcKhuJH+16OMlSoAiSbGzAtSP65LwQJk+nLRVWvddy+XVqApUiGCZ1aoGQ05I2V3sOmg==
X-OriginatorOrg: quicinc.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR02MB4205.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4a24e8fb-7dd5-4300-4bae-08dbf08d336d
X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2023 03:42:24.6828
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 98e9ba89-e1a1-4e38-9007-8bdabc25de1d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: HpOzPY1KzHKZbbJSINEJ4guNMDalXOQh+x91udaXqhu325NbFXUgtyERZOR2lfBQVqkuFOhZ3TjPOaMyQICDIg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR02MB7778
X-Proofpoint-ORIG-GUID: yIUXMGMbzvGky6oR1ED_NxgTfawlHe-i
X-Proofpoint-GUID: yIUXMGMbzvGky6oR1ED_NxgTfawlHe-i
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-11-28_27,2023-11-27_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0
 impostorscore=0 adultscore=0 clxscore=1011 suspectscore=0
 priorityscore=1501 mlxscore=0 bulkscore=0 mlxlogscore=959 phishscore=0
 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311060000 definitions=main-2311290026
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 28 Nov 2023 19:42:44 -0800 (PST)


> -----Original Message-----
> From: Thomas Huth <thuth@redhat.com>
> Sent: Thursday, October 26, 2023 6:31 AM
> To: Arnd Bergmann <arnd@arndb.de>; linux-hexagon@vger.kernel.org; Brian
> Cain <bcain@quicinc.com>
> Cc: linux-kernel@vger.kernel.org; Oleg Nesterov <oleg@redhat.com>
> Subject: [PATCH] hexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from
> uapi header
>=20
> WARNING: This email originated from outside of Qualcomm. Please be wary o=
f
> any links or attachments, and do not enable macros.
>=20
> uapi headers should not expose CONFIG switches since they are not
> available in userspace. Fix it in arch/hexagon/include/uapi/asm/user.h
> by always defining the cs0 and cs1 entries instead of pad values.
>=20
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  Based-on: <20231025073802.117625-1-thuth@redhat.com>
>=20
>  Compile tested only (with CONFIG_HEXAGON_ARCH_VERSION set to 2
>  and with CONFIG_HEXAGON_ARCH_VERSION set to 4)
>=20
>  arch/hexagon/include/uapi/asm/user.h | 7 +------
>  arch/hexagon/kernel/ptrace.c         | 7 +++++--
>  scripts/headers_install.sh           | 1 -
>  3 files changed, 6 insertions(+), 9 deletions(-)
>=20
> diff --git a/arch/hexagon/include/uapi/asm/user.h
> b/arch/hexagon/include/uapi/asm/user.h
> index 7327ec59b22f..abae6a4b5813 100644
> --- a/arch/hexagon/include/uapi/asm/user.h
> +++ b/arch/hexagon/include/uapi/asm/user.h
> @@ -56,15 +56,10 @@ struct user_regs_struct {
>         unsigned long pc;
>         unsigned long cause;
>         unsigned long badva;
> -#if CONFIG_HEXAGON_ARCH_VERSION < 4
> -       unsigned long pad1;  /* pad out to 48 words total */
> -       unsigned long pad2;  /* pad out to 48 words total */
> -       unsigned long pad3;  /* pad out to 48 words total */
> -#else
> +       /* cs0 and cs1 are only available with HEXAGON_ARCH_VERSION >=3D =
4 */
>         unsigned long cs0;
>         unsigned long cs1;
>         unsigned long pad1;  /* pad out to 48 words total */
> -#endif
>  };
>=20
>  #endif
> diff --git a/arch/hexagon/kernel/ptrace.c b/arch/hexagon/kernel/ptrace.c
> index 125f19995b76..905b06790ab7 100644
> --- a/arch/hexagon/kernel/ptrace.c
> +++ b/arch/hexagon/kernel/ptrace.c
> @@ -74,7 +74,7 @@ static int genregs_set(struct task_struct *target,
>                    unsigned int pos, unsigned int count,
>                    const void *kbuf, const void __user *ubuf)
>  {
> -       int ret;
> +       int ret, ignore_offset;
>         unsigned long bucket;
>         struct pt_regs *regs =3D task_pt_regs(target);
>=20
> @@ -111,12 +111,15 @@ static int genregs_set(struct task_struct *target,
>  #if CONFIG_HEXAGON_ARCH_VERSION >=3D4
>         INEXT(&regs->cs0, cs0);
>         INEXT(&regs->cs1, cs1);
> +       ignore_offset =3D offsetof(struct user_regs_struct, pad1);
> +#else
> +       ignore_offset =3D offsetof(struct user_regs_struct, cs0);
>  #endif
>=20
>         /* Ignore the rest, if needed */
>         if (!ret)
>                 user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
> -                       offsetof(struct user_regs_struct, pad1), -1);
> +                                         ignore_offset, -1);
>         else
>                 return ret;
>=20
> diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
> index c3064ac31003..f7d9b114de8f 100755
> --- a/scripts/headers_install.sh
> +++ b/scripts/headers_install.sh
> @@ -74,7 +74,6 @@
> arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_16K
>  arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K
>  arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE
>  arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8
> -arch/hexagon/include/uapi/asm/user.h:CONFIG_HEXAGON_ARCH_VERSION
>  arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE
>  arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO
>  arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT
> --
> 2.41.0

Acked-by: Brian Cain <bcain@quicinc.com>