From patchwork Tue Dec 5 10:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 13479876 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7175C4167B for ; Tue, 5 Dec 2023 10:08:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.647513.1010710 (Exim 4.92) (envelope-from ) id 1rASLY-00060p-BX; Tue, 05 Dec 2023 10:08:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 647513.1010710; Tue, 05 Dec 2023 10:08:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rASLY-00060i-8q; Tue, 05 Dec 2023 10:08:08 +0000 Received: by outflank-mailman (input) for mailman id 647513; Tue, 05 Dec 2023 10:08:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rASLW-0005zz-Le for xen-devel@lists.xenproject.org; Tue, 05 Dec 2023 10:08:06 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2e91f1bd-9356-11ee-98e5-6d05b1d4d9a1; Tue, 05 Dec 2023 11:08:05 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0121122060; Tue, 5 Dec 2023 10:08:04 +0000 (UTC) Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id B7DD3138FF; Tue, 5 Dec 2023 10:08:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id ArWzK4P2bmX6MAAAn2gu4w (envelope-from ); Tue, 05 Dec 2023 10:08:03 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2e91f1bd-9356-11ee-98e5-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1701770884; h=from:from:reply-to: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=2fYQv/39LJ/pI8k7gLnqlsK8l/cey3HS0JyD9skuDbw=; b=px9YmtebgyHlc7a5wrtMn8qltRRRoBjVOspgyMydzA1AQvl3txfWWUPkmgs7arLdbA5l3P zGPza2ljlKaI2LIoPT3HjEP+7Y1Q2h5YS7mkn+9rtHjO+2/D8HdtBlbo2f3RFO3ZfWlCmn pj7BictQ/LKTnzHgMMjdupkqtG4Fx3A= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Arnd Bergmann Subject: [PATCH 1/2] xen: make include/xen/unaligned.h usable on all architectures Date: Tue, 5 Dec 2023 11:07:55 +0100 Message-Id: <20231205100756.18920-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231205100756.18920-1-jgross@suse.com> References: <20231205100756.18920-1-jgross@suse.com> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [-3.30 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_SEVEN(0.00)[9]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[arndb.de:email,suse.com:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[99.99%] Instead of defining get_unaligned() and put_unaligned() in a way that is only supporting architectures allowing unaligned accesses, use the same approach as the Linux kernel and let the compiler do the decision how to generate the code for probably unaligned data accesses. Update include/xen/unaligned.h from include/asm-generic/unaligned.h of the Linux kernel. The generated code has been checked to be the same on x86. Signed-off-by: Arnd Bergmann Origin: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 803f4e1eab7a Signed-off-by: Juergen Gross --- xen/include/xen/unaligned.h | 121 +++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 35 deletions(-) diff --git a/xen/include/xen/unaligned.h b/xen/include/xen/unaligned.h index 0a2b16d05d..325d9f875f 100644 --- a/xen/include/xen/unaligned.h +++ b/xen/include/xen/unaligned.h @@ -1,12 +1,4 @@ -/* - * This header can be used by architectures where unaligned accesses work - * without faulting, and at least reasonably efficiently. Other architectures - * will need to have a custom asm/unaligned.h. - */ -#ifndef __ASM_UNALIGNED_H__ -#error "xen/unaligned.h should not be included directly - include asm/unaligned.h instead" -#endif - +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __XEN_UNALIGNED_H__ #define __XEN_UNALIGNED_H__ @@ -15,67 +7,126 @@ #include #endif -#define get_unaligned(p) (*(p)) -#define put_unaligned(val, p) (*(p) = (val)) +/* + * This is the most generic implementation of unaligned accesses + * and should work almost anywhere. + */ + +#define __get_unaligned_t(type, ptr) ({ \ + const struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr); \ + __pptr->x; \ +}) + +#define __put_unaligned_t(type, val, ptr) do { \ + struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr); \ + __pptr->x = (val); \ +} while (0) + +#define get_unaligned(ptr) __get_unaligned_t(typeof(*(ptr)), (ptr)) +#define put_unaligned(val, ptr) __put_unaligned_t(typeof(*(ptr)), (val), (ptr)) + +static inline u16 get_unaligned_le16(const void *p) +{ + return le16_to_cpu(__get_unaligned_t(__le16, p)); +} + +static inline u32 get_unaligned_le32(const void *p) +{ + return le32_to_cpu(__get_unaligned_t(__le32, p)); +} + +static inline u64 get_unaligned_le64(const void *p) +{ + return le64_to_cpu(__get_unaligned_t(__le64, p)); +} + +static inline void put_unaligned_le16(u16 val, void *p) +{ + __put_unaligned_t(__le16, cpu_to_le16(val), p); +} + +static inline void put_unaligned_le32(u32 val, void *p) +{ + __put_unaligned_t(__le32, cpu_to_le32(val), p); +} + +static inline void put_unaligned_le64(u64 val, void *p) +{ + __put_unaligned_t(__le64, cpu_to_le64(val), p); +} + +static inline u16 get_unaligned_be16(const void *p) +{ + return be16_to_cpu(__get_unaligned_t(__be16, p)); +} + +static inline u32 get_unaligned_be32(const void *p) +{ + return be32_to_cpu(__get_unaligned_t(__be32, p)); +} -static inline uint16_t get_unaligned_be16(const void *p) +static inline u64 get_unaligned_be64(const void *p) { - return be16_to_cpup(p); + return be64_to_cpu(__get_unaligned_t(__be64, p)); } -static inline void put_unaligned_be16(uint16_t val, void *p) +static inline void put_unaligned_be16(u16 val, void *p) { - *(__force __be16*)p = cpu_to_be16(val); + __put_unaligned_t(__be16, cpu_to_be16(val), p); } -static inline uint32_t get_unaligned_be32(const void *p) +static inline void put_unaligned_be32(u32 val, void *p) { - return be32_to_cpup(p); + __put_unaligned_t(__be32, cpu_to_be32(val), p); } -static inline void put_unaligned_be32(uint32_t val, void *p) +static inline void put_unaligned_be64(u64 val, void *p) { - *(__force __be32*)p = cpu_to_be32(val); + __put_unaligned_t(__be64, cpu_to_be64(val), p); } -static inline uint64_t get_unaligned_be64(const void *p) +static inline u32 __get_unaligned_be24(const u8 *p) { - return be64_to_cpup(p); + return p[0] << 16 | p[1] << 8 | p[2]; } -static inline void put_unaligned_be64(uint64_t val, void *p) +static inline u32 get_unaligned_be24(const void *p) { - *(__force __be64*)p = cpu_to_be64(val); + return __get_unaligned_be24(p); } -static inline uint16_t get_unaligned_le16(const void *p) +static inline u32 __get_unaligned_le24(const u8 *p) { - return le16_to_cpup(p); + return p[0] | p[1] << 8 | p[2] << 16; } -static inline void put_unaligned_le16(uint16_t val, void *p) +static inline u32 get_unaligned_le24(const void *p) { - *(__force __le16*)p = cpu_to_le16(val); + return __get_unaligned_le24(p); } -static inline uint32_t get_unaligned_le32(const void *p) +static inline void __put_unaligned_be24(const u32 val, u8 *p) { - return le32_to_cpup(p); + *p++ = val >> 16; + *p++ = val >> 8; + *p++ = val; } -static inline void put_unaligned_le32(uint32_t val, void *p) +static inline void put_unaligned_be24(const u32 val, void *p) { - *(__force __le32*)p = cpu_to_le32(val); + __put_unaligned_be24(val, p); } -static inline uint64_t get_unaligned_le64(const void *p) +static inline void __put_unaligned_le24(const u32 val, u8 *p) { - return le64_to_cpup(p); + *p++ = val; + *p++ = val >> 8; + *p++ = val >> 16; } -static inline void put_unaligned_le64(uint64_t val, void *p) +static inline void put_unaligned_le24(const u32 val, void *p) { - *(__force __le64*)p = cpu_to_le64(val); + __put_unaligned_le24(val, p); } #endif /* __XEN_UNALIGNED_H__ */ From patchwork Tue Dec 5 10:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 13479878 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7FEA9C4167B for ; Tue, 5 Dec 2023 10:08:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.647514.1010720 (Exim 4.92) (envelope-from ) id 1rASLc-0006In-I7; Tue, 05 Dec 2023 10:08:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 647514.1010720; Tue, 05 Dec 2023 10:08:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rASLc-0006Ie-FJ; Tue, 05 Dec 2023 10:08:12 +0000 Received: by outflank-mailman (input) for mailman id 647514; Tue, 05 Dec 2023 10:08:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rASLa-0005zz-OG for xen-devel@lists.xenproject.org; Tue, 05 Dec 2023 10:08:10 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 313a06f1-9356-11ee-98e5-6d05b1d4d9a1; Tue, 05 Dec 2023 11:08:10 +0100 (CET) Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 9440122060; Tue, 5 Dec 2023 10:08:09 +0000 (UTC) Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id 559D3138FF; Tue, 5 Dec 2023 10:08:09 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap2.dmz-prg2.suse.org with ESMTPSA id T0yiE4n2bmUIMQAAn2gu4w (envelope-from ); Tue, 05 Dec 2023 10:08:09 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 313a06f1-9356-11ee-98e5-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1701770889; h=from:from:reply-to: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=lq6Aix92m1tHhsIqJbDqfDfy3efyJN8pLKRv9vH1cNQ=; b=pBEvvnH2FkEEI5TtKI0Dx+Q692w8oeck2k9zDaBZ2cXJy/i6X6dALwo1gCQQ71/NWJBxxj LNRNJpXIiq456Piw0CZupK/zz3tOMn8b6ThMWH4T3S5f2t4DuPNh7SJzR42FvfbzVpC/F/ AJRCnLHEmH7+gK8w+1OGcER8dOcO36A= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini Subject: [PATCH 2/2] xen: remove asm/unaligned.h Date: Tue, 5 Dec 2023 11:07:56 +0100 Message-Id: <20231205100756.18920-3-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20231205100756.18920-1-jgross@suse.com> References: <20231205100756.18920-1-jgross@suse.com> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [4.80 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; BAYES_SPAM(5.10)[100.00%]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; RCPT_COUNT_SEVEN(0.00)[9]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[] With include/xen/unaligned.h now dealing properly with unaligned accesses for all architectures, asm/unaligned.h can be removed and users can be switched to include xen/unaligned.h instead. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/include/asm/unaligned.h | 6 ------ xen/common/lz4/defs.h | 2 +- xen/common/lzo.c | 2 +- xen/common/unlzo.c | 2 +- xen/common/xz/private.h | 2 +- xen/common/zstd/mem.h | 2 +- xen/lib/xxhash32.c | 2 +- xen/lib/xxhash64.c | 2 +- 8 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 xen/arch/x86/include/asm/unaligned.h diff --git a/xen/arch/x86/include/asm/unaligned.h b/xen/arch/x86/include/asm/unaligned.h deleted file mode 100644 index 6070801d4a..0000000000 --- a/xen/arch/x86/include/asm/unaligned.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_UNALIGNED_H__ -#define __ASM_UNALIGNED_H__ - -#include - -#endif /* __ASM_UNALIGNED_H__ */ diff --git a/xen/common/lz4/defs.h b/xen/common/lz4/defs.h index 10609f5a53..6d81113266 100644 --- a/xen/common/lz4/defs.h +++ b/xen/common/lz4/defs.h @@ -10,7 +10,7 @@ #ifdef __XEN__ #include -#include +#include #else static inline u16 get_unaligned_le16(const void *p) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index a87c76dded..cc03f0f554 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -97,7 +97,7 @@ #ifdef __XEN__ #include #include -#include +#include #else #define get_unaligned_le16(_p) (*(u16 *)(_p)) #endif diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index 74056778eb..bdcefa95b3 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -34,7 +34,7 @@ #ifdef __XEN__ #include -#include +#include #else static inline u16 get_unaligned_be16(const void *p) diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h index e6814250e8..2299705378 100644 --- a/xen/common/xz/private.h +++ b/xen/common/xz/private.h @@ -13,7 +13,7 @@ #ifdef __XEN__ #include #include -#include +#include #else static inline u32 get_unaligned_le32(const void *p) diff --git a/xen/common/zstd/mem.h b/xen/common/zstd/mem.h index 2acae6a8ed..ae1e305126 100644 --- a/xen/common/zstd/mem.h +++ b/xen/common/zstd/mem.h @@ -23,7 +23,7 @@ #ifdef __XEN__ #include /* memcpy */ #include /* size_t, ptrdiff_t */ -#include +#include #endif /*-**************************************** diff --git a/xen/lib/xxhash32.c b/xen/lib/xxhash32.c index e8d403e5ce..32efa651c5 100644 --- a/xen/lib/xxhash32.c +++ b/xen/lib/xxhash32.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include /*-************************************* * Macros diff --git a/xen/lib/xxhash64.c b/xen/lib/xxhash64.c index 481e76fbcf..1858e236fe 100644 --- a/xen/lib/xxhash64.c +++ b/xen/lib/xxhash64.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #endif /*-*************************************