From patchwork Mon Feb 19 15:39:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1363604dyc; Mon, 19 Feb 2024 07:40:58 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVxVfhxoR+Kr2MayS+6IIk/pfCvK2nlRW9w5cyoMee93MRb8YpzW1OHIiMQSa1UHdRSvhcuvF+n3xtvB1GXycRzdgdalA== X-Google-Smtp-Source: AGHT+IHyWqwFEK9+H6MLz8trxYEjGtBqG55UZuXwzLvuonIPql6kJM2c6NRtYRD/G7e5eHCxCVaZ X-Received: by 2002:a05:6e02:1d97:b0:365:3a69:1e1a with SMTP id h23-20020a056e021d9700b003653a691e1amr1077016ila.0.1708357258709; Mon, 19 Feb 2024 07:40:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357258; cv=pass; d=google.com; s=arc-20160816; b=DgO67HC4K0yodlAzLGe5d4E2/jBfqsJdMgVg/57ibX2BnfTz0Jx7Jba8ybTixLQVJi MzgwiL5PM9IQvwyUPrMxqFUisvc/D0Nw5k9+dxMCm7xS2IV1aXRQzrQkzUJcvL+IXFBr FkcsdlYsv38RDwYpd0J8HSRfKIFTQvLzY/hadqh/ikvNb+SsCa2Dible4QZPxYFzlTW5 mCRyS7YyVnY8FRrRw3lQdbrnNRbq3pwrv9txcYcYd2RQc9PWdp9d+D0uI11NHcB7aj9o 4VwARapxXc5W/tgMsAp1NLci3lJH5yPg2QYdVOjb67OduyNEGv6+oXoyJC9IhkTYexMk jlng== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=2THOEnwAJiXgtrKYZPFtdOpgH3pVV/ELbGPBq/l2joE=; fh=7nx5oR7euHLtaDcHkbIp35ocMFmibozVif+FdERjWO8=; b=ZSmkDVXjzq9OVtyzIHf/Nyr556wPgYgqJAnDM32aEQc0begZhICyb7cIkaa+Exkz6N X9686pjnbj+tthnGijyCJPkhyJy4iVhvDP9Sgs5RNZ+ofHIzDGMgSAIVPbghQ4CE+CSe Myc5PK8V5Iq96wDJUz8IWEOoYFXlWRhb4lzLXXb1EWKFxfDkOWcGZKzMU5XXzdHO9CRN VZ4nH9K8N2E0qAcn3qrwDPdqepmFEr2LCa7eY7Km9+hIOsPLbXRFhwdJJYHykoCU9fyR XAMDuXJo8VCgiWUntO1Da1N+y97jkW/aHJnGOV6X6ZRwxkbtdPwYjk1RyHrN1BC96ngU E/4w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=I0m32Lb6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71596-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71596-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id z21-20020a637e15000000b005dc82a6711fsi4598504pgc.102.2024.02.19.07.40.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:40:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71596-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=I0m32Lb6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71596-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71596-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 7B2F4284F05 for ; Mon, 19 Feb 2024 15:40:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3C52A3E46B; Mon, 19 Feb 2024 15:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="I0m32Lb6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="SjXnqLKO" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 BDE6F3A267 for ; Mon, 19 Feb 2024 15:40:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; cv=none; b=FtvH0w65rds4/JzZumY5yVnGl2DYwzDAI9XzqoDicH2KMBEOQqVhq4ge+/sGhoi6xm/yb/bhbGE8w/J+ThiwcYeTQ2INxZrYwppAshCKot2jLkGVYqPxv9554k6EXZialRkISGKAHWqqNNS7tcMX0axTF+uBXGbbNPykD76Uyi4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; c=relaxed/simple; bh=/FzeKqaG0j2mmEV30Lj3oWwxV021Lej+8GfyOXwTkJg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ltPIYOirBp9Zn0pW5G9O3z55ntiLfHz4dmsqyCOXsVah5kWSCGGhXGtaa+zOyyS4CcbAhZ4+jMK7OHWGAXwII1qbVoY9XoOp7Gvv96txMpMEB3Um2FS+foOz3Xsiwyuv1n1OSsc8ovTv43dpg1rfrI5YvAPDULllVhs5deg0mqc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=I0m32Lb6; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=SjXnqLKO; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2THOEnwAJiXgtrKYZPFtdOpgH3pVV/ELbGPBq/l2joE=; b=I0m32Lb6T/ObtZKMnhjIHn4MwbFOMtybRMuAVEWI9k/eJvcHdm4qGkmYaxccoxK3r84qIw bfHTltqdWu2hR8sF8DlqiJKqhreFB3O79TUxlBJdIgsQgY6gDunzDYSw2Pjnpd0vSzyjBo 97K4qJkMRsRuXMxNcYocS+P8Laab76ZrWv1XD/SClO29CjtNdKPGLszNNi6I3BymGHg54w hguzTh5Ew8uTbgoxdHjBKjMynA2OaoHuOIfYvp5BSZGymt13B0tQkgMYigPJC7TikiOW9z 8MjumUxi6P1VZwmGnyh5fDo19Yb27+Q3mpCqpZjG+oA17gXzLJO+DegrpQhhaQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2THOEnwAJiXgtrKYZPFtdOpgH3pVV/ELbGPBq/l2joE=; b=SjXnqLKO7XBqm2sC7xJY+X1D3xKVo9NNT3JTkgrn/es1HLWwFPqzMh5KEPPIA5Lgq0FrHq Ms3/yiU7V5Dt6kDg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen Subject: [PATCH 01/10] vdso/helpers: Fix grammar in comments Date: Mon, 19 Feb 2024 16:39:30 +0100 Message-Id: <20240219153939.75719-2-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342420522438639 X-GMAIL-MSGID: 1791342420522438639 Signed-off-by: Anna-Maria Behnsen --- include/vdso/helpers.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vdso/helpers.h b/include/vdso/helpers.h index 9a2af9fca45e..73501149439d 100644 --- a/include/vdso/helpers.h +++ b/include/vdso/helpers.h @@ -30,9 +30,9 @@ static __always_inline u32 vdso_read_retry(const struct vdso_data *vd, static __always_inline void vdso_write_begin(struct vdso_data *vd) { /* - * WRITE_ONCE it is required otherwise the compiler can validly tear + * WRITE_ONCE() is required otherwise the compiler can validly tear * updates to vd[x].seq and it is possible that the value seen by the - * reader it is inconsistent. + * reader is inconsistent. */ WRITE_ONCE(vd[CS_HRES_COARSE].seq, vd[CS_HRES_COARSE].seq + 1); WRITE_ONCE(vd[CS_RAW].seq, vd[CS_RAW].seq + 1); @@ -43,9 +43,9 @@ static __always_inline void vdso_write_end(struct vdso_data *vd) { smp_wmb(); /* - * WRITE_ONCE it is required otherwise the compiler can validly tear + * WRITE_ONCE() is required otherwise the compiler can validly tear * updates to vd[x].seq and it is possible that the value seen by the - * reader it is inconsistent. + * reader is inconsistent. */ WRITE_ONCE(vd[CS_HRES_COARSE].seq, vd[CS_HRES_COARSE].seq + 1); WRITE_ONCE(vd[CS_RAW].seq, vd[CS_RAW].seq + 1); From patchwork Mon Feb 19 15:39:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1363827dyc; Mon, 19 Feb 2024 07:41:23 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUcy65X8S8w4pIaF9kzBEnGzFbqfDyJtQiIN7wO3LdZ9CwOHtVr3IoUhnsyO6vGdeD092pxArSQqf4DJ+ldY3F6k+83YA== X-Google-Smtp-Source: AGHT+IGyxak8E/tpntw69hhBjVSiVLSYMumrdANy1+lCoQ7oqbI0HvTSti11JcAu/I7+sqzaTZAu X-Received: by 2002:a05:6358:706:b0:178:92dc:8a32 with SMTP id e6-20020a056358070600b0017892dc8a32mr12877297rwj.20.1708357282725; Mon, 19 Feb 2024 07:41:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357282; cv=pass; d=google.com; s=arc-20160816; b=S0bP854qnzWPtGaV/Dwwhm2Utx5/NfyA9DtEdaL8DGbHpTcLu39g8wtuzpb3lGG+db HKplP6xbKld9rg4vFh4jmwVbkqRu6LE9upUjPs+eHFwXSqeztT26W3dup5Zn6FtEs3Pg xNYd/yN5vRcvIlapfIFIsoSWM+70cyRW7FwewVl/qIETBqIsEZ410AOrqUSfpKZBuoPV OmGRYBUy5kv7gjOhXt2WbQAq76rgNodwaeGNWWeiTEwAj/Htj8Aq83H20PxZsHyPw9Xp TyPGgC9USeiBQtMO72+rqPeIYOfGdhl2U1R+kQrU1Nwz/QUlab1Y5Ot4gX9J/myKRRC7 KA4A== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=RZRHjbrAHlMpISwMWg/IDeX5g8kU9D+wZnJXRxM/GjY=; fh=ZsSYhddLON0dtz5fISSo3KV+novd6DbV00OAd6wbw9c=; b=mw8U/LFI/b1UQbJ0XQ7sdF8HBP1DpGiidiEYMtUthKkL18UG2lnfovfSiWCm4V9dTl pelr13WVzxrV/Qvuzg0Dyl6xmQEqAbas4oR7sEhi2BMjl9yZZpoBLSCU7Jrh3PqF0uZn B+6tc12Y6M/+hsedBAxnxFFFNUSEJrl9iXneEu+8s8I/mPAB4yqmqByB692bS9smViNZ jUkP+W4I4tVaSTxQguVeccwPyywKu8uOJ8GGU7vA2CUugTWTKkJnCE1AxIWMHXUHJUZ9 EihJ631Vut77FcICbQTSX1BiOBCgtm0Ra6k4KILkTWQ8NoHs7e6qSg4pU8vlmlA25vy6 XyDw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Zg1JoeF2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71597-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71597-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id r25-20020ac85219000000b0042dd78ecba6si6161112qtn.580.2024.02.19.07.41.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:41:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71597-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Zg1JoeF2; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71597-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71597-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 B22A31C22B97 for ; Mon, 19 Feb 2024 15:41:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7701B3EA60; Mon, 19 Feb 2024 15:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Zg1JoeF2"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TvbUIcYq" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 014893A297; Mon, 19 Feb 2024 15:40:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; cv=none; b=LW+mdZiMaQTbehfTFDQbsVrk2bHD8CP8uaTraejfqavNSOx4REh0UiOG5FZcpiZm5apEgkQY410CtiTtRgLEtxtbwrCkGAyG0Oz2dR7PRtL7tRWyyCEGuC9B0sufOzMi/2jLOyPXcD2Yd/r0EVxPxMJa41MEeVzmvw8c4NYavBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; c=relaxed/simple; bh=4h8ofa9qIf+CH6w8b3X1CVwcM9lNaj4SGvAAsc8wGck=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kXZ37EqF/ScnB/o0l5w+IrRKRfktIvW8IFLa98zklcJHYRr0wvWTTYj1KZnCj+ziGAZnBa+5ke4K4ZUlS+biDIenEBjsSaukmwnjl8s7/PC7Loal/PY1xanxkdsg8DoWuno3U7XnkEYXqw6F9UeHNlpp2tw4kMaf9v2QEWzJGwk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Zg1JoeF2; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TvbUIcYq; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RZRHjbrAHlMpISwMWg/IDeX5g8kU9D+wZnJXRxM/GjY=; b=Zg1JoeF2lTsifOPN88i8wUjYoB88l/6mCCv9aHFT+TzPxy/CV3SPYQNvhM+2ufjNHCHyUt iZXNwPH1UjuztQUIa//DE8fhH7vykwNXWoohGYEi88SYKMyp7mgc0at0Ic1bwIdR7MVqrz 6jfEIzqP0kcoK9je52kJqkyPijkxyewL+xIgo9HLNfbV56vQaViP6tvgiixJruyuuyo5d2 MWr/a8z+VPReiC1yHJHYhgPzx4DRu5WV860OCQvSBIRhAV1mT/Duv4yuBQIV+JtzijsjG/ xven8rQTU35zdqKST9Xxdo9A3n58iLWWIvDgQD0Z8MFYchjZuwEtiSocAl9Stw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RZRHjbrAHlMpISwMWg/IDeX5g8kU9D+wZnJXRxM/GjY=; b=TvbUIcYqXbpYl4fQVCUcaDFFoRnbUNlRp9JUsTOVB9QFnaPjSxwoQ+7CN/XxxfJnDHoaoy Nwsdf4h1ti0R0qCg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , linux-s390@vger.kernel.org Subject: [PATCH 02/10] s390/vdso/data: Drop unnecessary header include Date: Mon, 19 Feb 2024 16:39:31 +0100 Message-Id: <20240219153939.75719-3-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342446097070751 X-GMAIL-MSGID: 1791342446097070751 vdso/datapage.h includes the arch specific vdso/data.h file. So there is no need to do it also the other way round and including the generic vdso/datapage.h file inside the arch specific data.h file. Signed-off-by: Anna-Maria Behnsen Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: linux-s390@vger.kernel.org Acked-by: Heiko Carstens --- arch/s390/include/asm/vdso/data.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/s390/include/asm/vdso/data.h b/arch/s390/include/asm/vdso/data.h index 73ee89142666..0e2b40ef69b0 100644 --- a/arch/s390/include/asm/vdso/data.h +++ b/arch/s390/include/asm/vdso/data.h @@ -3,7 +3,6 @@ #define __S390_ASM_VDSO_DATA_H #include -#include struct arch_vdso_data { __s64 tod_steering_delta; From patchwork Mon Feb 19 15:39:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1363906dyc; Mon, 19 Feb 2024 07:41:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVROpNIkMYjWIvdOScJoc7qNA8Nc38qsFjk+Bal5gULq/cKJkM2E1nYZgpiNs/xR0i5X6lSqoRxi+ZtbWOZ5nrdJjSVbQ== X-Google-Smtp-Source: AGHT+IGSMgIpZqbGOVOsOtP9Tr31oi3V+Bey/CMtwS+easCBONDDQ4mvM0FmEeSxXQw0SCOj4+9W X-Received: by 2002:a0c:e2c2:0:b0:68f:20b0:5b21 with SMTP id t2-20020a0ce2c2000000b0068f20b05b21mr13268403qvl.4.1708357292000; Mon, 19 Feb 2024 07:41:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357291; cv=pass; d=google.com; s=arc-20160816; b=Lvtm0IDSZT3fOQLN3/eDX3hoAPoFcZqthP2aSEnQodciYbUccL7D5gjg6PYky3+6kr MAKUsP1O9TjELbTlZZDAtlVWEZwMm6z32Uh9fQwTdPqF7hefNFqjJKQ7SQShpho92Td5 XI8SVQbRXBu5GDBWUJM0zwxfH4yOxMbL188cJAJxgFqyzSz6bZdtn9v8rHg1zPko0ifP Qqh+frdGN46XbUSyT7Q6aD0iyH6cuCAwI1CIWKzl4NSjsCr50ED+D+frJlCBSuxXM0/t 3zoh/sNUfIStHXbXnP1zXC0NT0yuaAbdNZstAZR5JRy1i+wKdKK18DOO+5pZNpr2ktQE zxPQ== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=U51NQ0C/sqG0k3Ofsflj974vXvNUKI5iq+y1fWYWuoA=; fh=HavhPIxzi8uQEeobxVhfVwIe7D0byHSRh/pW4SSTV6k=; b=BQN09VR5urIfvwdza58qKXcoJZ2tN/yERp4PP4HA2QxLGiQYEbM70o2IybiRuQLcx4 cYoZfLXBMiWWMdmIhhQO1D5Zka7LPUwyJcu9TLB6JxMZt3duype6kcw73+2PwT/3hd+t aurdZTC9D0PgRZmjTEK14y3geCabmvWbY1bM/ur6G7URS012/QcrMID+lwHN7GJWlxWU tLBhvRY/CFxi3lo0jsiC8okwR4t/n6Xxhgl+5bCGfYGoDU7p83yJZkxlD9nb/o3EUcoT dxEyo6H4tpI18kjfY0uOcellRWRglBoq4JyeuJDeqEEiY64QKANMQddbeQklCxtvkNk6 9jZQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=d0qhxuxn; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71598-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71598-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id jn3-20020ad45de3000000b0068f13129ab3si5183960qvb.350.2024.02.19.07.41.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:41:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71598-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=@linutronix.de header.s=2020 header.b=d0qhxuxn; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71598-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71598-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 A6F341C228CA for ; Mon, 19 Feb 2024 15:41:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F33A63FB35; Mon, 19 Feb 2024 15:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="d0qhxuxn"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Z/DDyv+g" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 5FE0B3A8F4; Mon, 19 Feb 2024 15:40:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; cv=none; b=OCyFbSGT2xt80hP+ARIp9e/3P6ckOgMkQmfZuudQrloQYGmgW/cEpj1+Gd0dLVTOF+9q8p5X7yXuEgciF4k/TRt5KZrBmvQ1NwfIZseLpDebJ9nZaSCHzmycxQhcB6HyqBXI0oVuu1P5MOXgR1Wfm6KTDi59w5uXKozXd9jXpho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357207; c=relaxed/simple; bh=58CUWxVlxm2mlSFdFUvdFxekmd2xImPEn9ABAjDBWok=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tpVdCLzgOeWE0CCAKRTnO/cu2l5Fc4ULel9RUaFK64gq5OxqZcs0esYYWFE0jSmw8em13o+qWV34Q4Zhob1tjF5+YBd7IvEZC5pV8mZw1DzbpfGB2/MhtS8sw1B8qPW21JGTrm2GIZoNZTZx6AJpzfoYvq2XeXpRixHFWPCGyOo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=d0qhxuxn; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Z/DDyv+g; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U51NQ0C/sqG0k3Ofsflj974vXvNUKI5iq+y1fWYWuoA=; b=d0qhxuxnsSpYGsOeZ4U81H1DlPOa3vx6VYhqqfzkE16V+mu361hQ64QzxmFKtIbGhNhQXr VSDKAL/F4qd91grgCFQSWZCwW4ltGq3dXvP5xDKep7Hy7LZknzUFGBwhv+3FprUdCmvqRD SX/oDNX1uR2BgMca28mK0pUxqoh2xLAqi3DTKH4nYS696Q7dmDSJr4w9BuAzNmZP9f6psc yZsaTC3SX/M2ovROraSnk2MB1aEjVIo5KvbO5dCXYupXdxhXyJkcVqyFE6iuIaA44z9Bf9 qSZ4rCrE6OY1cIbh3kfzXkKassnS4S47ssmWQhkIITzNqzBtNzEAbqnMTHLLfA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U51NQ0C/sqG0k3Ofsflj974vXvNUKI5iq+y1fWYWuoA=; b=Z/DDyv+guMTwbx7NrIiiBC4hv7+btme15HBUJiJWRwGhFZ2vEP6hlOu7SsG2HnwffOt3kJ qPPi7YU5Qg/zmhAg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH 03/10] csky/vdso: Remove superfluous ifdeffery Date: Mon, 19 Feb 2024 16:39:32 +0100 Message-Id: <20240219153939.75719-4-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342455415072055 X-GMAIL-MSGID: 1791342455415072055 CSKY selects GENERIC_TIME_VSYSCALL. GENERIC_TIME_VSYSCALL dependent ifdeffery is superfluous. Clean it up. Signed-off-by: Anna-Maria Behnsen Cc: Guo Ren Cc: linux-csky@vger.kernel.org Acked-by: Guo Ren --- arch/csky/include/asm/vdso.h | 5 ----- arch/csky/kernel/vdso.c | 4 ---- 2 files changed, 9 deletions(-) diff --git a/arch/csky/include/asm/vdso.h b/arch/csky/include/asm/vdso.h index bdce581b5fcb..181a15edafe8 100644 --- a/arch/csky/include/asm/vdso.h +++ b/arch/csky/include/asm/vdso.h @@ -5,11 +5,6 @@ #include -#ifndef GENERIC_TIME_VSYSCALL -struct vdso_data { -}; -#endif - /* * The VDSO symbols are mapped into Linux so we can just use regular symbol * addressing to get their offsets in userspace. The symbols are mapped at an diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c index 16c20d64d165..e74a2504d331 100644 --- a/arch/csky/kernel/vdso.c +++ b/arch/csky/kernel/vdso.c @@ -8,11 +8,7 @@ #include #include -#ifdef GENERIC_TIME_VSYSCALL #include -#else -#include -#endif extern char vdso_start[], vdso_end[]; From patchwork Mon Feb 19 15:39:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203152 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1363977dyc; Mon, 19 Feb 2024 07:41:39 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXJvJl47QQxnQyFXOXhB8fNuOr0ex4Pdrcj3uv75FuQR3hJargAUpReifT0zmRcgmQYDnBkmOy9IcwtBhNkkudVyagH4w== X-Google-Smtp-Source: AGHT+IGn7Aemn/X1xnMd/bKFYBa+CRZM20BGu5/5wP7Ii3rMyPRQ0vKceLEgGB7ySHSF2H1idQ9i X-Received: by 2002:a17:902:7ed0:b0:1d9:a4bb:29f2 with SMTP id p16-20020a1709027ed000b001d9a4bb29f2mr9863288plb.46.1708357299722; Mon, 19 Feb 2024 07:41:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357299; cv=pass; d=google.com; s=arc-20160816; b=L8wJ2Zhy14oU3j3x7BYhX3+vP7GEh282O2ja6p6sMhhTOb6G+5vNfc1NXGvEr5Nue2 lQmjSRmNPG3vKA0ZR1y8fBv4sI9YpkpnCXvNQ+whFZYYlmd6tgAyNosuNQWkov6qNx45 bFv1JBVMfICrzzv+pSpV8NKUAh+mQ+ravl4xdCmi3CFvexffBaWEHG3ubXumFtHa7h4C 6F6B8HiL7cAj+agj1zely4Mo/17NI384GohpdPJSVlV4u2FVZmJl8IxAIo5rsPFvBpNk VWg/U703PNTG99h/e3p/p5E0OWIasRg2Sg93jR6aCT/WtoCTFJkN9sWc3dTC00YSBWSe GHmA== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=QlKcGbQq5n1Lw3ANMVFZoMmufVy08yz4U/pR4YBIv6o=; fh=Nx2YW50pAR2bPUBI+SEMiQx8T/QhDIC834QrLJg7z8M=; b=JN7VmurGItckX5P4uM11kR/PchtC0aZMxAi9pPgRIhG2W7XVcGPqUkfORVag2/8fOC QVnVdbl1ItM6QaVbUs7ciCYXpmPWs76lBpMPhX/oczrHQ65qlh2vZ89t3UErRrwvh/fC Bk7I30GlYzxlOLRYNumAf9OQ28yyvPpYOmlufO7GxG0Z3sV3RomT8mHLuTTPfWC2GqA6 HnTUKanUriQJ3h6iabRKSo9WSHm1X60dV2HqCuCYXXSzIi0v7slQyzjgsRd1KWiJo5mt s8g5hzIVPhOXPU+F/qZgMuXpMmQsNGpCLE9TqBwRkesg6PjGXVe2z8LgSO1EbXTy94Ch mRAw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DQVndt3p; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71599-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71599-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id b14-20020a170902650e00b001dbd677a910si3332959plk.500.2024.02.19.07.41.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:41:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71599-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DQVndt3p; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71599-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71599-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 7F017284D42 for ; Mon, 19 Feb 2024 15:41:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 079E041C83; Mon, 19 Feb 2024 15:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="DQVndt3p"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="znuj+4xx" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 D24AF3AC08 for ; Mon, 19 Feb 2024 15:40:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357208; cv=none; b=kVxbiACk2j8tdSpq0kV7kG+aHcQR4ZPlfdaLrLOlKFTCRz2HZll+AYOjGcLv9oKGaIhEOhFL5VQESBuwpyA/K0bqdrS1n9sn1AvWYOJ+qOocdi9d7htuKMkZmigwhx8bzr4OO9Cp2X1p9aUQiGfyXQOyQWvk/RAi6tMc+aQjR1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357208; c=relaxed/simple; bh=4nSPlxQK2Qa4EXTdhd2aosfODHzGKDI3DJ3vUm8YPFE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lg8GAzo3eP/ZeIcvnvWbdpkmEcR3tBD4rRz1X5OwlwkJvrRVot1N1DNbQHBqr5Um028OYXRHy03O1qwD7Q46FfOcU9NfC5AHBqBbuVM9cojTk4DGN1/fWAMOQeAjzDC70SJAZ5ygjhe1qcUmwmHxh6yeyNbIt8PBtClBvivoRXk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=DQVndt3p; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=znuj+4xx; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QlKcGbQq5n1Lw3ANMVFZoMmufVy08yz4U/pR4YBIv6o=; b=DQVndt3p0yfttx5AUPeZCN3iTtdWAV24hcFQuNtKUGHDfWkmTmFOzBwJ4tX79ZpwmjQqlo wsPmcs6vqvJKWsSFuoHbpNZFIBeMUIyKj8ntew1GN8JErgcphPgfCzSBjXIRVnkRuvh00b 3U7UjOc9gWh78q87i+720c5EaQDtDSmfqsqibDcmLbYUmEjYhfpJ3v/IUgZ9nkm9TA4czC rzJjPBcvSHRkv3zGbOzlOmEhJsH3SlIyGHObDLQy1LHy84ud7HDnQ+KIym5dKFkKnBuUr0 gtlWnwlHDN4wVXCuystRefqWOwCqZWRdd076BoftdfAE+sZOnUPycjEXnz/h6A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QlKcGbQq5n1Lw3ANMVFZoMmufVy08yz4U/pR4YBIv6o=; b=znuj+4xxxhEIGTq4lLn9ezO0YtooAhxLQ7RA0DFKxuk+jNtat7QB8A5H1hpkVLW5Edcw52 0IGraAgMTD7ge5DQ== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Russell King , Eric Biederman , Kees Cook , linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/10] vdso/arm: make union vdso_data_store available for all Date: Mon, 19 Feb 2024 16:39:33 +0100 Message-Id: <20240219153939.75719-5-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342463534032454 X-GMAIL-MSGID: 1791342463534032454 The vDSO data page "union vdso_data_store" is defined in an arm header file and also defined in several other places. Move the definition from arm header file into the generic vdso datapage header to make it also usable for others and to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Russell King Cc: Eric Biederman Cc: Kees Cook Cc: linux-mm@kvack.org Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/include/asm/elf.h | 1 - arch/arm/include/asm/vdso_datapage.h | 26 -------------------------- arch/arm/kernel/asm-offsets.c | 4 +++- arch/arm/kernel/vdso.c | 4 ---- include/vdso/datapage.h | 10 ++++++++++ 5 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 arch/arm/include/asm/vdso_datapage.h diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index d68101655b74..9f21e170320f 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h @@ -4,7 +4,6 @@ #include #include -#include /* * ELF register definitions.. diff --git a/arch/arm/include/asm/vdso_datapage.h b/arch/arm/include/asm/vdso_datapage.h deleted file mode 100644 index bef68f59928d..000000000000 --- a/arch/arm/include/asm/vdso_datapage.h +++ /dev/null @@ -1,26 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Adapted from arm64 version. - * - * Copyright (C) 2012 ARM Limited - */ -#ifndef __ASM_VDSO_DATAPAGE_H -#define __ASM_VDSO_DATAPAGE_H - -#ifdef __KERNEL__ - -#ifndef __ASSEMBLY__ - -#include -#include - -union vdso_data_store { - struct vdso_data data[CS_BASES]; - u8 page[PAGE_SIZE]; -}; - -#endif /* !__ASSEMBLY__ */ - -#endif /* __KERNEL__ */ - -#endif /* __ASM_VDSO_DATAPAGE_H */ diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c index 219cbc7e5d13..4915662842ff 100644 --- a/arch/arm/kernel/asm-offsets.c +++ b/arch/arm/kernel/asm-offsets.c @@ -21,10 +21,12 @@ #include #include #include -#include #include #include #include + +#include + #include "signal.h" /* diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index f297d66a8a76..d499ad461b00 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -35,9 +34,6 @@ extern char vdso_start[], vdso_end[]; /* Total number of pages needed for the data and text portions of the VDSO. */ unsigned int vdso_total_pages __ro_after_init; -/* - * The VDSO data page. - */ static union vdso_data_store vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = vdso_data_store.data; diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h index 73eb622e7663..7ba44379a095 100644 --- a/include/vdso/datapage.h +++ b/include/vdso/datapage.h @@ -19,6 +19,8 @@ #include #include +#include + #ifdef CONFIG_ARCH_HAS_VDSO_DATA #include #else @@ -121,6 +123,14 @@ struct vdso_data { extern struct vdso_data _vdso_data[CS_BASES] __attribute__((visibility("hidden"))); extern struct vdso_data _timens_data[CS_BASES] __attribute__((visibility("hidden"))); +/** + * union vdso_data_store - Generic vDSO data page + */ +union vdso_data_store { + struct vdso_data data[CS_BASES]; + u8 page[PAGE_SIZE]; +}; + /* * The generic vDSO implementation requires that gettimeofday.h * provides: From patchwork Mon Feb 19 15:39:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203153 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1364253dyc; Mon, 19 Feb 2024 07:42:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU7DIPuzB6PQicUD4lc0SNU/5IzsC5STlwG+wAdyYsh+BkXXDQQOOzSBOHaPwuExcTK/7n6uAnNII8fMJUdkdmFPe3eFA== X-Google-Smtp-Source: AGHT+IFUu+Wl0YTRtiTXK1dX2+qKYj/84iaRTK/70aEGtKaKWvgpHveZeuapwU1mYtCOs0eskL47 X-Received: by 2002:a05:6870:5b92:b0:218:9e23:6826 with SMTP id em18-20020a0568705b9200b002189e236826mr15209619oab.3.1708357329436; Mon, 19 Feb 2024 07:42:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357329; cv=pass; d=google.com; s=arc-20160816; b=mioLmJuLNj85c5Y7vzhyNf7QhADeBaMfegEA0uxVaaZjTZWlHfZtlTGrFH5jfdEq+C 12gxvWmw3rGRdvYOG/3ae4I3z/VMAdfwwmXfM/bSoAgtUpsH+EtA/H4z7UALbInaVrhN ygdhsHhkirkA6YGuWs49yHbzJGDk++wEOZ/HaVmHcamjQ4RKnftAJo56PWNUEBd6qQP3 HZUadLDS0qolTHDddC+Qc2pdpUNVaqCHgbRD1yISmBSBpF2KbhoIR7LwKNRIDI7b9fkL l3r4nbtaCUeACGd/4aavva4zyfEriySeiCGr2Acmu45RczjA61Ir2lC/TDopqOzWDWv8 iPWw== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=TERCToEIU1g/eqQgTt1qdsHKnOD82z4H77Fq474fFqE=; fh=/liCT8ZXEl5ww1rW9kGeZLNJQDCvgh+Km7xvRZv7zSo=; b=RpZfTvjUK71IxCIZhqZRUYSzBXsNiUlDGvaRuQQN4rN2AC47Ps0lpEAxMkrMHcIIYG TgTlgX3KOK2+Yb2rEF1W/DirGcoMY/kUS2tVxbfUUpdFxRfJvSXhiaH97Ortg6gLwilM ZcTYevofRVJ58rz12EySGEPPuGFXrgO8w0WjFp8btAeD5scTjlVl4r9Jcg6cvK71i3Uy 8OqXKLIHxCzCBcBgV4QNJAERSiSuuRrOYxQiCwtgNwIJOxjzQPrEeZYcV68fScmhtIlx YfToL6doKRPGMSohDpFzWU8bEuEvrFeJXN27B4nDF+MXCqyS5kPNuAKmCZSPUp4OllQQ 2XKA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=i0YoW3qr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71600-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71600-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id oo16-20020a05620a531000b007873a97da69si6338035qkn.161.2024.02.19.07.42.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:42:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71600-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=i0YoW3qr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71600-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71600-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 E4BD01C228BC for ; Mon, 19 Feb 2024 15:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DB27F446AC; Mon, 19 Feb 2024 15:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="i0YoW3qr"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="eQSzwW4k" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 7A7003C49A for ; Mon, 19 Feb 2024 15:40:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; cv=none; b=ss5td9S4EL/A3Z9mOknZc3B+EkUMTPA3C4qWsk8AleLcVulM1ziIRjdE7SDgCpAeOt7WsWaL837iKBoLpZXtaJCg7gQ3y72N6dihcUuAYivHao8fcyxE1TGQpht7Zr5/Pl30iHv89xi3EgX3C+zXwNlaebvNiEz7HcVhsfGiF9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=Egn/4loMwHErFaYxX3+cKQLZn6okX8CccVfeOzBn8aw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SinziMD8y46HRsCSwPz1xT4t1qdjQdJAkN51iNN1ofLbgFcVodez1YuHC7nLY9wab7h4JQDjI2Dos1nLDzmXZJeWYIm9nuhDLKLqqopvdq/xMMy/omw92KlB5grwNgM+4o2BIYtOSA5GoBeXy1CpUKlTtblHNTt9D5R7+YnISLU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=i0YoW3qr; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=eQSzwW4k; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TERCToEIU1g/eqQgTt1qdsHKnOD82z4H77Fq474fFqE=; b=i0YoW3qrOVk3P8xkqI05dmx7ulsyuLhIy4BdFWKLmt8S0vVUBGjAS9N/d7bdqZ3tBQ6cP4 IYgQ/JqjZgl5NvI/i3D0gfedBge8Hr+NiZxCJ68h828PLcyLIO4l4DKVQCH9qC+U/dHVC6 8v4+TDkrgclxK1p289PeCeY4rvh0VVAMCtbdilYydpoVS5y3eEr/cWJsjAGW4PL+k6XPgz TgA/OhyqF5SVMKEaHztiL+gHRdbAslL3pcod2JaLuT6pYZGGjALPxLq2pee6FZ9jAxZZY7 n6G6xf8WF2Sa6i7wlvFtnH+MmjFzxpVC80D894uI5IESwXYVCqcqL6VYU3bPpA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TERCToEIU1g/eqQgTt1qdsHKnOD82z4H77Fq474fFqE=; b=eQSzwW4kfSJejLlyBll+AQLjET3Cra/9zvqyTsqucpJCt7NwSSKmemZRCwV35XOep+vfRY AukEQf4ZmrCFKMBg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH 05/10] arm64/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:34 +0100 Message-Id: <20240219153939.75719-6-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342495174509380 X-GMAIL-MSGID: 1791342495174509380 There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Acked-by: Will Deacon --- arch/arm64/kernel/vdso.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 5562daf38a22..89b6e7840002 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -69,10 +69,7 @@ static struct vdso_abi_info vdso_info[] __ro_after_init = { /* * The vDSO data page. */ -static union { - struct vdso_data data[CS_BASES]; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; +static union vdso_data_store vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = vdso_data_store.data; static int vdso_mremap(const struct vm_special_mapping *sm, From patchwork Mon Feb 19 15:39:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203154 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1364252dyc; Mon, 19 Feb 2024 07:42:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWnjkhPlb9wSc867R0UYWiFgd6OMEv6mQMzxVpOoZQ/1e7wxcwopSiDSUp/nXLZLmmxT6VDQv+bbN+rNwxu+1rVgBMRmg== X-Google-Smtp-Source: AGHT+IEmuqT6aIW6HS9xbDa1yckQTzhe4/qw+BUWTtUQ7YVyUIedNfOTDwGCa3v3eHQtbzbm/cCU X-Received: by 2002:a05:622a:54e:b0:42e:beb:bb3c with SMTP id m14-20020a05622a054e00b0042e0bebbb3cmr4252726qtx.43.1708357329508; Mon, 19 Feb 2024 07:42:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357329; cv=pass; d=google.com; s=arc-20160816; b=cKWGA/2DGLtfceNj3J/p/7UyzWarSgRjyeZutAFQQ8GshTDcS4HX+ZRXmlalhWwjti 4z18VWGVexwOcpYFfTO4qvtCmLvJW0lBVXjMLk6depK1xSQD8amriixH97fJmOy+gPTo f8yO3qQIWV2bUu+4Yl30lcpHdLLXUSwYpMsyD3Ln+vFS4hJ3KmuiBq+uQgSNXhNbV19z fo7T90CUHBPZHqgbK4kVjo/cYkx1v+09DRjFGd3eqB+JtKd+z6ob5xUoWefqCIbd+s6O XMsTQp74mhpD/2EPjv88+sG2HsyFopEAqrPNZo86TtAq96ZEWdVwv2LsaIxajmy220ze GP1w== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=HSJH2Cy3AOqZmgikXh7qng6szl5HlWuz3PgXeKPeks4=; fh=x3JoHGwOrSN2MhJ27mJ87dngKJthnbtuRMDwC03W7dI=; b=pkw8DB0+XDQ37NICtHvAvSW2nHHrl7M/0sF9mmhGR237jOa6BfBWQ0XrRXL34SDCue S6kY7+C6Mbj8bMyIbkx+8oXr9qrqn2rBGWes77S5qysmtPJutGDcwns6uMVEjkRqzU9e ff73piVvP0uAC4HTRm39qkRqkDOlf4tkpp9bsQXx6mnDpgoJ34KVyomYgICUWQgRgZW0 jzgo85/MzE3AQZJKxu0TsxQzKzWDhSrlvCurE1DrvF+vilSW4eWYOkenWYgvUJVqXbQC 4wBvHmzUAFu9HVp3lXOungr2u7cJDdwHegIWQnnD4wNbwR3MF5Qnq2TxxIPn1O6mGd9R fQJQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=e8ck0Fru; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m18-20020ac86892000000b0042c57017316si5946095qtq.64.2024.02.19.07.42.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:42:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=e8ck0Fru; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71601-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 31E771C2274D for ; Mon, 19 Feb 2024 15:42:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EB54F446AE; Mon, 19 Feb 2024 15:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="e8ck0Fru"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="OUpLh70/" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 7A7343C49C for ; Mon, 19 Feb 2024 15:40:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; cv=none; b=HHfNONNeIFKtRSstN7pOYO4FVqdCcX8avaIZHTZZ0L0ax5MBkZdg7MokCB1EJwvV6B3N+8r9GUEiKK7CMf/G8o8H0HQ+G1yw3FGnVy4jxDyn3F/66c/ZXHe/tyKNs1x4FEA998VA8M8g9hYoJgkWrHuq6KD5snKg6N61q+0zDSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=uwGKUudqINu/l2LS4UDnc84Sy7bVMtcbCFymgjZtMeI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fKj6gQQq0AyMv2Jc17r2iresi6F7MBpd4xH62iFbVN4TIyoqcGbJrMZkWhKVKfqY9MLrWvoN7lW7chR/zp8YNcSgNAOrRro4TjRXWsVrQnBb8A9iX3MhjKUBer/061jPZDYeTJ3BX6t2NTNLWHGmOhHzI/EjvqHa6FqMrYpC2BU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=e8ck0Fru; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=OUpLh70/; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HSJH2Cy3AOqZmgikXh7qng6szl5HlWuz3PgXeKPeks4=; b=e8ck0FruzZ8Ag+/b5iHDLfIUxz9zmagc1f5rEiyK5hbbzj/S1I6gnFAFXaVxyBtsMkqHzF r3sco+vWtbdQfXMs/jAETq3/y9aizlcKB6nlpxeqssBVvNsHtpfgiak0jRhNchDVoGjYKq RZPEA3ub6REw1ibtUcbODrfwKIIwHzy60GRhDTtZ0y3wAORbzXwiK2V4vJ3zVWTB+L9Ky5 3ZV9koyLq5KoU80y9k6mp+yeksnv1k5N8zMCi65KDKTGZ+G0Y5ATW8+/nHgR91kIoE43T1 GIvca5Ues2wsqmpjhDoIhNEMY5vX7qfxmb3U9m4wISnoEoWZyJSTVNr2dPeqsw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HSJH2Cy3AOqZmgikXh7qng6szl5HlWuz3PgXeKPeks4=; b=OUpLh70/kjYmndXYQ+Zlava3G4i+VeFfT1Xxc2MZrt7OW5qubKGDDj7Q3tgRl3hGOuaL6g Nbk18oNRr5ZzodBA== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org Subject: [PATCH 06/10] riscv/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:35 +0100 Message-Id: <20240219153939.75719-7-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342495446151541 X-GMAIL-MSGID: 1791342495446151541 There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: linux-riscv@lists.infradead.org --- arch/riscv/kernel/vdso.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/riscv/kernel/vdso.c b/arch/riscv/kernel/vdso.c index 2cf76218a5bd..100cdea6d3e3 100644 --- a/arch/riscv/kernel/vdso.c +++ b/arch/riscv/kernel/vdso.c @@ -30,13 +30,7 @@ enum rv_vdso_map { #define VVAR_SIZE (VVAR_NR_PAGES << PAGE_SHIFT) -/* - * The vDSO data page. - */ -static union { - struct vdso_data data; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; +static union vdso_data_store vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = &vdso_data_store.data; struct __vdso_info { From patchwork Mon Feb 19 15:39:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203155 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1364279dyc; Mon, 19 Feb 2024 07:42:11 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUmfVLL9+RCf5eTzfxgRPRZbOZBY+0KpaOwq1XBZt97IjZ7tZv9/UJ8WNi7LJYHl99m1muF9LYL2gUs88lHDEpOkAIwPg== X-Google-Smtp-Source: AGHT+IGNwKbro9fI16fcV4vrgP2UpP2Np5K1n1X7+WNR4GNJn/kX07vtVOtPGYyF4or6Nv02u4jy X-Received: by 2002:a17:902:ea91:b0:1db:9a69:293d with SMTP id x17-20020a170902ea9100b001db9a69293dmr9525740plb.24.1708357331229; Mon, 19 Feb 2024 07:42:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357331; cv=pass; d=google.com; s=arc-20160816; b=u/tWjQRpF4GE20bKnigihvuGVp1L5oBZmsUm8LLysUhqHfQKv0+GzN4UxEP1d1BiVE MFUv77mBGIQIYqlQBrz2q3dFAYYLWDAptphE1qvaoLxMW5vlgkXFs1l3LW1GbXhQhgJC b7W7n7twBtELSbEHZL9cYhcuq4/HN4HVKwB4kmzCesm3AAU3ivfmi21I9Hty75dbsC6Z 1l+s74eOgu46XQzqIAsMgO2okgblLOHX3ObyZJZnM+GC7FoxZHl8Q7gVdQhL9hHzgxEN PouQuTpN9RYNSm2z2JKN9vE+Qn0rKrzmVwkTrts2QvG2s/VdrFYFO5QnNwJkpk6rG2Xy LLDA== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=jU+XjkvuIDGH4O48sip7TH7TW67eQu5qXALaeJfPZY8=; fh=ZsSYhddLON0dtz5fISSo3KV+novd6DbV00OAd6wbw9c=; b=Stu8Z/Zn9pHGPdCPrlH4uAeHbSvx4gGh12dY7L7ZzChNoh9S+ziXV9pU4rmMz3yR1K dGkZGIYKbbI+TeTgWfK3kEDSo2kuC7KTVSyvU9V/kHHdxppjlDAlDTBM8WTFZDeknS3Q PxhDo42gXa4YqLhfLjVP9UUELhy5ql/2lLwNgTTHG+MNf7npJ7RjKeQGg8K/cUTyMs+Y 4MkEtmx03UZjWKQelXRKTBtpUMdJyAXLxrxdWmeeIE3m3LbiPCE1lpwnzMLFTlZV1vLP wi4oarXr62UEb0TmNQIe46wY3bIZhOR1WCTLEAS6tkea3gjced9nqQ/y/+OKGog+hdQI ZrNg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=29uN5GrD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71603-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71603-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id h7-20020a170902f54700b001db2ad29d18si4670865plf.145.2024.02.19.07.42.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:42:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71603-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=29uN5GrD; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71603-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71603-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id DEF5C284C03 for ; Mon, 19 Feb 2024 15:42:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4F5D5446CB; Mon, 19 Feb 2024 15:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="29uN5GrD"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="MR81Dmyl" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 DD7723CF67; Mon, 19 Feb 2024 15:40:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; cv=none; b=OT/TbxOwTS7tzk1joALoaPXWWAwOHhkY5mKS1zk0AwDScW0hXh607+LvGJPIR2iXie12q88d3E3vH1CGNN6zu4Ih/4zGO9CYH4NUCPXPazB6tEw3BvykTCX2Ik9cjBenCCQa6B6JSSUJ3wWKixXBwqdihdC8FGXoXo2m/JJ1lqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=2xglRp24K0ngAsMpicpTrhgbwtum8XdpL/77bvNcnqA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G5htdoh0DewkaHQ5hboba1pOUsQFzufU7vIbqzeaXwpkc+2taASsnSheJgEDugKEJaIwvjk4nUtxEvpayFakFafNxBsnLAITMWf6eRBkAbVt4BHE880NwZhBO20VP/P0vSjU4aMlbma7BNv/ZuQeYOWb0VoqFd2Ng17qyfkUWSA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=29uN5GrD; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=MR81Dmyl; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jU+XjkvuIDGH4O48sip7TH7TW67eQu5qXALaeJfPZY8=; b=29uN5GrDPNQqpgJ6urrtY7kzwPWAi92vGvXafx330dxbY0YR3Yn14LU65fylLvyq8Tz51f C5gVCyufz7JDYc01w+Wb7PRLZGN8XY8h6gplAk1fO//tmnF1s/Gi4GzEvPhT3CXgGssbsz AKkbKUO6bzENLBURGD/BAkpEsEz0ietBYwjEYjHA+5DzRuw8XWof8eRYGrBo7HZU21m/Es vFVzVkv0qHGVyd7aoTZr8kUjgFEMTbW2TyWgJ0XdZV5GKJASekyu/dhpvkbEOpi8FZhsWr 1Trip6PB6kQ3yiuFItNNByUFyRamvRavMhPvUe3MPqSjjBD/CklW1kgpxbeeOA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jU+XjkvuIDGH4O48sip7TH7TW67eQu5qXALaeJfPZY8=; b=MR81DmylMnhvEy0enrO6LQ6uCQ7K6zDF+DdNGdyuhMeJW9ljJHszQc91pKg7l/U5PgTHeJ UXOOpoe9Twp1YHDQ== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , linux-s390@vger.kernel.org Subject: [PATCH 07/10] s390/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:36 +0100 Message-Id: <20240219153939.75719-8-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342496809208576 X-GMAIL-MSGID: 1791342496809208576 There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: linux-s390@vger.kernel.org Acked-by: Heiko Carstens --- arch/s390/kernel/vdso.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index bbaefd84f15e..a45b3a4c91db 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c @@ -25,10 +25,7 @@ extern char vdso32_start[], vdso32_end[]; static struct vm_special_mapping vvar_mapping; -static union { - struct vdso_data data[CS_BASES]; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; +static union vdso_data_store vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = vdso_data_store.data; From patchwork Mon Feb 19 15:39:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1369456dyc; Mon, 19 Feb 2024 07:51:59 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX+X8yQzG0BWPRugbT5g+cC+v6HoOna50cUYwcHiR1VgetN3rHs+CJyV2hwKlhZEtr/N55F5B+tNbF4Ry9n7a2be9Y15g== X-Google-Smtp-Source: AGHT+IEOPiojKaN0hU8FU9r9jg10VdoGiRIbKUK0P5JPkJUSXxkWqHvJYYQlHeXwaZHmxd/OzoYu X-Received: by 2002:a05:6358:8aa:b0:178:7554:df34 with SMTP id m42-20020a05635808aa00b001787554df34mr10930619rwj.18.1708357919321; Mon, 19 Feb 2024 07:51:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357919; cv=pass; d=google.com; s=arc-20160816; b=RZawcyM6XdXvzXdTnzFuE5UToHRhqd09uGb3AefHmHNTI6PPQu2rQgk1EQ9f213Lyf Jb8Y4szf49a21oTp/p+HaEAqtOofGXX6nWQMET6/Mrze91tc3ogjanpZ+VWb1WOnNJkX 8TDS0cAiPLYDFe4WpvIt9rf/amKrl9TJ9PY0rnN4Xat7JoTSrSp6RnvJqLwXnrB1exD4 bvQxMn+hu9q8sPu2T46yuMO/w8hcVceXgd7HmrAvxusp3yXCf9Rl/a1sxBEgvSWf2f5A /Tco0IvnstLC1N/SPLAAaZ8woBSjeoGeesrBbBtD0btyjyHr4l79c9YxHLfwSzNAnsNc 9dgw== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=lp+RzcryxMV8zaG1CzKINGmkFkhMVE/l8rdV67gjFt0=; fh=0ejQ0iM6H2+21STsSwlfjm562AJo1h1UFyyzyOgaijg=; b=xJMPC+7J3zkrV8uea6dJIa8fvBjP5UIr6qF4c1n4Vra+i93xA928B+Y9Uju+9OQnLS Tfi14ND5taEInjlYEVxQa/pDxNOi5dpY7CrSkSJIJo7cFZlhrnIim2yKCX9naSRh6QYL 94GOWCb1ohVxI6Qy/pFUOxnog89N4fyOnHNXgcnAB0RI/NglDNw1KXgF1q8yEpCjVWVz lHZnlnFf0rIXGirqm8UKun2WVdXvU0CLvqNg9kIEXcxwaoqdcUxhLdBehbAJJGiE8aKV POyCE2lMLmb25lbDteJCnbME9cnPoZ7LtZIJBhEzkrHjEEpVLbG7f2PDeh8JcjAfTeOB tZHw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=gyzqlXGu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71602-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71602-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id bn20-20020a056a02031400b005dc89de5d21si4584227pgb.776.2024.02.19.07.51.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:51:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71602-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=gyzqlXGu; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71602-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71602-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 55DE6B2247F for ; Mon, 19 Feb 2024 15:42:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2FE91446BD; Mon, 19 Feb 2024 15:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="gyzqlXGu"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="98MXiKOK" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 C40E43CF53 for ; Mon, 19 Feb 2024 15:40:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; cv=none; b=dBJgAUV0ElnsXemL2K4fPZL1NWMZ+0rR2f7NIClOLQyRGxtpHj0LSfjgr4MpNHrV+Z15GXyeae7BkoDtCcSw6ZhJ9gLHJ36leMF7PVcV2RLq5VKr9L09cN79T7tp512L9friHbGQimydz3b7ooQqHAWEhoMx7gry7NeoN1A63d4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=2fbQDpTO4Tey39i4Yfg4XMK0iSzMhLQFeet5tLx71IY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VUxsXVGGX//b3Iwc0UzZPtJt76lbyA8/k0KtjQIZBEJ6Dj4FtomgOWbfsMYP/TxGYZ5MkUL6Kgvlww03OAXtSuLhCvfFO64T6ycRS9IRhrzKdOqO/SBor+BpURSpODlXeXI/nvV8jyiLP4P+oafgFyBCpF761HRjbbyf9cEqzM8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=gyzqlXGu; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=98MXiKOK; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lp+RzcryxMV8zaG1CzKINGmkFkhMVE/l8rdV67gjFt0=; b=gyzqlXGuzWp4QMqcPJo5aZYgAIRs0qFNLdXXEiXhtJi65M/ccdsGa8e0KaHDcDA1K2WZIp mCUtwyavQxP9ujmzKPuqrsiOJArtP+nA/jresToDIXNc6w5o2Uf8JJuxH+SYemvwp5Ot8O OyF7jnQm3LpTgWFv+DUJhmHEg9y0VH3fJXIfT5OYQz36rEXKCw0cUTW4Z+1c6HnBpj5zfK 6cJgYkqosyTi71L2vSZfrIx/fv51LSXR4H4zdtQLPsIepESzAVkr3e24dl5P5vj8ojFk2Z okDzTCfyt8fqBfnlHG+sXtqHgBHruzCX5JCrIC7FYpoJ2xiijxtQExx4OO1J1w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lp+RzcryxMV8zaG1CzKINGmkFkhMVE/l8rdV67gjFt0=; b=98MXiKOKw1HG+Rcg0+36jc63lJvDkwgBP/Aoa8RFjRKVULn80umgrTa8zsCcVLTWf8rvyt Gp/WTg07f+n/0ECw== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Huacai Chen , loongarch@lists.linux.dev Subject: [PATCH 08/10] loongarch/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:37 +0100 Message-Id: <20240219153939.75719-9-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791343113668355604 X-GMAIL-MSGID: 1791343113668355604 There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Huacai Chen Cc: loongarch@lists.linux.dev --- arch/loongarch/kernel/vdso.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/loongarch/kernel/vdso.c b/arch/loongarch/kernel/vdso.c index 14941e4be66d..90dfccb41c14 100644 --- a/arch/loongarch/kernel/vdso.c +++ b/arch/loongarch/kernel/vdso.c @@ -21,15 +21,13 @@ #include #include #include +#include #include extern char vdso_start[], vdso_end[]; /* Kernel-provided data used by the VDSO. */ -static union { - u8 page[PAGE_SIZE]; - struct vdso_data data[CS_BASES]; -} generic_vdso_data __page_aligned_data; +static union vdso_data_store generic_vdso_data __page_aligned_data; static union { u8 page[LOONGARCH_VDSO_DATA_SIZE]; From patchwork Mon Feb 19 15:39:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203160 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1369546dyc; Mon, 19 Feb 2024 07:52:07 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVkAjG+WXuayKYnqW5UK0g6Of3dVHIqWLcQCdtSLQR27EDjtgzWUkt2ybaK39zqsZs/RZG5+pCh0v2wfrRn0mD+dZQZQw== X-Google-Smtp-Source: AGHT+IGE/XSC8Y6Qhpt3ok6mlrrC0cNqHEPxvtGR8xjuJ9LbCUG9+YGEpUIrRWRqLaEgI9btwOBH X-Received: by 2002:a05:6a20:9c93:b0:1a0:931c:a152 with SMTP id mj19-20020a056a209c9300b001a0931ca152mr5369831pzb.21.1708357927639; Mon, 19 Feb 2024 07:52:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357927; cv=pass; d=google.com; s=arc-20160816; b=wmgMBufbsHjQydKFZb4qLERMDTFjaJYcddZrpstArlpYR3GGqdRrjf93jT7cxxltuU iHLK2d1dy1a3JQ2rSF2dgq/+8ttAeG/m3fmcETbFzYMizCzWs6hYHOoRpZ1XJbib3Esv t1zp/guzbvNCUgg8w4Q4YRdQGTPsF7m9fiaguKf28wxpiHmjLuKPPgcIBkf1e2Ny0maQ Issgccwdj+MemIn6jUtvlpd89YyEOSrcH3UrCLdmgGaOhgm7PYBz4nUmw0zlstZrLphF 5YpQNjjgiMVWwmIJypGMtS/KjluLOqin3Ger4F0WIbBGtl37htUAkCHv2beCVYCKXRAb TWgA== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=p9YNrD7tVQTrXaMc0HLx7Bog9I9Y+lcWW3PT+KiRz7g=; fh=AcSusxu0U2JrrOgXdPRXnbdeW/+GOCoXVRAjAAVg4aY=; b=zbZ4Ml9tAomHZ5iOlZi2+GQoMOwg7avCqGD7h5RijmrpgjRLDE2BW3N/SGod6MQkaR kT2LH07snumpAQLaqdQs3IuMGlJtKoDEfuaUs599U/SOr3+BYj0Wi2g3L19GXnWIS4CA FWqWqWQwtBLiCdww2WrLjCmhjKjx3VoWELQ2pf/FIE8s8joWEDrbjm7vXRdQidyM2BaF E69BAhP87Xdi9Y7MuN8FPlVA+MO7xz0qvhLtPgyX+uiam1lgMnxV+K7HIFlzjMrN3MWj BD2eiwX5jjQ/oqD0XhlfdHfalkbIlKx+uQ+jAWUG1R1/zu2rd+cJOlPQaqPnMQIHVw7V udIw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="RJ3a/vYz"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71604-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71604-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id b190-20020a6334c7000000b005dc8a59e303si4584167pga.111.2024.02.19.07.52.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:52:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71604-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="RJ3a/vYz"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71604-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71604-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 sy.mirrors.kernel.org (Postfix) with ESMTPS id D35ACB253EE for ; Mon, 19 Feb 2024 15:42:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 909DE44C6A; Mon, 19 Feb 2024 15:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="RJ3a/vYz"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="H2nFv2f5" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 427623D3A6; Mon, 19 Feb 2024 15:40:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; cv=none; b=n9Oig5dSyZLndSHXTjNIe5viFWMCN07Oo4C3JrBKbJT8wk/cVxa4NYZOszg0rw0UdAo6gGncrgp+47MKG6Y/4NXcKJr5q1duq4nAfDv/JaIo8aGcUiYMp+km/0yUK/0gzXAsKx+Jvq7g/ahjfk/wAeLjVMNtE+LE61F9xKc3ZPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=Egt3w6vKpDeIpAiXo8C6D0ps5U8rKblI/NKKhpwZTB8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=k4s6GfogSiuYgEuEhIuRzZgtZm2QMvieFqMGxOrikUDrokoMez2vTRTV1li6hWP2vpcEkV79jag9K5ZVOicxBi4+Q6PYiG4iyo+4Gxf+PYaepAZSiyIijz14WvJuemfcy7FnNi/JzTTH7ZWWBzSsCOR+FbT8UTKYKkUtDQUCw0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=RJ3a/vYz; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=H2nFv2f5; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p9YNrD7tVQTrXaMc0HLx7Bog9I9Y+lcWW3PT+KiRz7g=; b=RJ3a/vYzw3wkv0lfjHWOSa3CQH7dtEAd1TsC2GWp6zruN6abfp84kgYTK1tOfgdD1DwORD Rodida/DODREXt5n6/TNYKea1SQifVc/5cLMdEQRveMD2Nw8H/M7SAVIdhvupthNgbkFxP 9kSMPEiLmverJWsp7bMt/cfJDAO6kMt+I5wIm4WZkr8lNHDcIGgRUEFDsFNDpzqjjvfpuG HjZDrKqAJJaqlZJ8DfzuObIdrdPV3WxO04sG50UFPvM2VHIMRYjFw39DyKUpxQQKOxy2SA 77fMzo1a1QxMcAXAFvNWlZa6fGwQRjQUf9STwBcs1im13Q9FRgc/J04tfWqCNw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p9YNrD7tVQTrXaMc0HLx7Bog9I9Y+lcWW3PT+KiRz7g=; b=H2nFv2f5VzCxp5vwhmWZv4sSB+CxOkUflxB3/09HSK9yyjsJkr2/6UMNUpeu5OPNOcFu/p G48PpkvxupQND0BQ== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Thomas Bogendoerfer , linux-mips@vger.kernel.org Subject: [PATCH 09/10] mips/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:38 +0100 Message-Id: <20240219153939.75719-10-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791343122521475701 X-GMAIL-MSGID: 1791343122521475701 There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Thomas Bogendoerfer Cc: linux-mips@vger.kernel.org --- arch/mips/include/asm/vdso.h | 5 ----- arch/mips/kernel/vdso.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/mips/include/asm/vdso.h b/arch/mips/include/asm/vdso.h index cc7b516129a8..afb03d45bcd0 100644 --- a/arch/mips/include/asm/vdso.h +++ b/arch/mips/include/asm/vdso.h @@ -50,9 +50,4 @@ extern struct mips_vdso_image vdso_image_o32; extern struct mips_vdso_image vdso_image_n32; #endif -union mips_vdso_data { - struct vdso_data data[CS_BASES]; - u8 page[PAGE_SIZE]; -}; - #endif /* __ASM_VDSO_H */ diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index f6d40e43f108..dda36fa26307 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -24,7 +24,7 @@ #include /* Kernel-provided data used by the VDSO. */ -static union mips_vdso_data mips_vdso_data __page_aligned_data; +static union vdso_data_store mips_vdso_data __page_aligned_data; struct vdso_data *vdso_data = mips_vdso_data.data; /* From patchwork Mon Feb 19 15:39:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna-Maria Behnsen X-Patchwork-Id: 203156 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1364374dyc; Mon, 19 Feb 2024 07:42:21 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUZ7Yg0GMSUiw4Y/QIhhcsIF1ty//tJFkuiKNej4TVI2pOjskRLH45u4esZW0gn8cD9l4O0EKFAgP0YiVu6KhrKpCkJkQ== X-Google-Smtp-Source: AGHT+IH4tVKD8cxZtrGDMhlODFliNwrD57fc5PZT1DCwuorzNKg8TqeduyrFLQ5wmSz7Fi3QteBw X-Received: by 2002:a05:6359:1012:b0:179:272e:54e4 with SMTP id ib18-20020a056359101200b00179272e54e4mr13817087rwb.20.1708357341550; Mon, 19 Feb 2024 07:42:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708357341; cv=pass; d=google.com; s=arc-20160816; b=gU7E5UxzyK6CYAstzUSwd3TDAD4d9r8rHdB72KzHOSrZWgJ7inL+XsItT7YBkRifSX /ud0RN7ll87r2AH77DYDasfM+A9BRiIJqYzoPNxl6YuM1fPIz27P8ZAxIxjfS0q2FkFX ENmO34DryvF1yJzXmrD3Apj+CKKJcsXZaDpEBh86vQN+EsfQ/mwsURBx1qtnIX5IuGro 3hLAkb1KIGXrH/IpKv5QTrfW8e46/Xk+3VyIDmwjVqs4GBHzmdfHivAuIdOPg4z0QB7h 902GagP+odgpNuNl8rkZE37J3g/Sg0lkXHo2d99uhGXoOj86zBEcEcxSS1s41DUrsxxO srGg== 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:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=jTsHPIZ0ef28j3t4F2fpsa7oGTHGH9ta8CIKVXueM1c=; fh=HavhPIxzi8uQEeobxVhfVwIe7D0byHSRh/pW4SSTV6k=; b=peDV5rKP0LfsmDbfqdBFIpELyV+lFRasw/sBcJRRlZb5iAHULvma3JzI3o8e8FNsq8 0KGQKgCEZgEj6Wv76tsN8rTWYbnJ/rsqE9cnRR2TxKnU69f3yGZHzppfMZMlRKGw+I+o Mugo0h8hn2u+6AtbDsuRzY5HV8FVlhhTy5gS7QhETLb5298+lqYpYtFiHJoiRBDK+PuM IgX0zlf23ce4V7kbX0PpqwoiCMdbqp12a9hBBIpUq7jjn278aY+nb0hUCR5IP+NzWreu ODTq8mHcKmxg/zZQNRjPWOaKFV/pA1WoVM2fBNC5OusqvERPFLoIOlS1oo2AmvUbjXXx S15A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="3/UM9dNj"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71605-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71605-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id o14-20020ac8554e000000b0042c2eac1cf6si5968512qtr.720.2024.02.19.07.42.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 07:42:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-71605-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=@linutronix.de header.s=2020 header.b="3/UM9dNj"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-71605-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-71605-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de 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 022661C22931 for ; Mon, 19 Feb 2024 15:42:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A41AC44C6D; Mon, 19 Feb 2024 15:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3/UM9dNj"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="VArxm8BU" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 427373D3A3; Mon, 19 Feb 2024 15:40:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; cv=none; b=QdfDf5lkHCkDJFUMEWiVLb8JqTDvtRiI/5rcbzJBJaixpT8baWnADyJnPv35fJVbNNISps8TMHLy+vUapSgz7dyWtMYLAyuxYrQxRJa+u4tnXA+fZaaHcBpkdD1QASOzwOvDwyE/w2RP4ja9norn2JVE079+Mg8y+t8SFsQgrso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708357210; c=relaxed/simple; bh=pWCDQWj1ZGKNeKtUkk10UnRUvitx2JkEKKGeUE/9QBo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cC8q10TjcEKf2kZ3AoMYqZLuUKALtclYc5jd8BASC/W7UTlwFCNBayRVX1sEvTLyBU9Dqg75sSMPCHO6KVVngNTEbo6exN+5umzEdBfrE7BUpCkvCsBSN9ogeBKuWLZEJa6PNahuNmm2joj7Zj+VzYX/vy4IWq0kJLl10qgvWvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3/UM9dNj; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=VArxm8BU; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708357207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTsHPIZ0ef28j3t4F2fpsa7oGTHGH9ta8CIKVXueM1c=; b=3/UM9dNj5/TaM9bUdHKQcc4OKv7ja6XkGFpf2YFpvEfr1XpudXG74nes6wwth2aXCf1p90 smHhAMqlq1RbZPkaEbFDJ36ydOS4dPPK829KHE8BmozcwkUTy3NNbZwPNSjQTLzdmI70cp zb1c/KBdeU05g6/PbpA4DXGttlh1rsOJEQ7Ei+R9wAE1li79sPX4vv5cgThYHA/yfw2rYV d1GO4k49vPKz8zgFsUL7fDKAdIINIqOGFTlZoXocRXZoV8kLquPvC3i5MAa4R4WXUJBJoN 5r6otuTsNVx2fnEULa4TUb+TioXDf/0Tem8ESW8NoOMbwokvxoOU5KH+J1CRLw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708357207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jTsHPIZ0ef28j3t4F2fpsa7oGTHGH9ta8CIKVXueM1c=; b=VArxm8BUHFw/wNcOu6uyuCQuJOxxlgvOQN8+8bFiy7NcVxaY2v32b5mFu0FfhaSRY1AnBf EPQp4M6V5QF/AvBg== To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Anna-Maria Behnsen , Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH 10/10] csky/vdso: Use generic union vdso_data_store Date: Mon, 19 Feb 2024 16:39:39 +0100 Message-Id: <20240219153939.75719-11-anna-maria@linutronix.de> In-Reply-To: <20240219153939.75719-1-anna-maria@linutronix.de> References: <20240219153939.75719-1-anna-maria@linutronix.de> 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: 1791342507806979579 X-GMAIL-MSGID: 1791342507806979579 There is already a generic union definition for vdso_data_store in vdso datapage header. Use this definition to prevent code duplication. Signed-off-by: Anna-Maria Behnsen Cc: Guo Ren Cc: linux-csky@vger.kernel.org Acked-by: Guo Ren --- arch/csky/kernel/vdso.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/csky/kernel/vdso.c b/arch/csky/kernel/vdso.c index e74a2504d331..2ca886e4a458 100644 --- a/arch/csky/kernel/vdso.c +++ b/arch/csky/kernel/vdso.c @@ -15,14 +15,8 @@ extern char vdso_start[], vdso_end[]; static unsigned int vdso_pages; static struct page **vdso_pagelist; -/* - * The vDSO data page. - */ -static union { - struct vdso_data data; - u8 page[PAGE_SIZE]; -} vdso_data_store __page_aligned_data; -struct vdso_data *vdso_data = &vdso_data_store.data; +static union vdso_data_store vdso_data_store __page_aligned_data; +struct vdso_data *vdso_data = vdso_data_store.data; static int __init vdso_init(void) {