Consolidate {get,put}_unaligned_[bl]e24() definitions
Subsystems (6)
v3 cover Consolidate {get,put}_unaligned_[bl]e24() definitions
Hi Martin,
This patch series moves the existing {get,put}_unaligned_[bl]e24() definitions into include/linux/unaligned/generic.h and also replaces some open-coded implementations of these functions with calls to these functions. Please consider this patch series for kernel version v5.7.
Thanks,
Bart.
Changes compared to v2:
- Declared 'val' arguments 'const'.
- Added more Reviewed-by tags.
- See also
https://lore.kernel.org/linux-scsi/[email protected]/.
Changes compared to v1:
- Left out the drivers/iio, arm/ecard, IB/qib and ASoC/fsl_spdif patches.
- Dropped the sign_extend_24_to_32(), get_unaligned_signed_be24() and get_unaligned_signed_le24() functions.
- See also
https://lore.kernel.org/lkml/[email protected]/.
Bart Van Assche (5):
linux/unaligned/byteshift.h: Remove superfluous casts
c6x: Include <linux/unaligned/generic.h> instead of duplicating it
treewide: Consolidate {get,put}_unaligned_[bl]e24() definitions scsi/st: Use get_unaligned_be24() and sign_extend32() scsi/trace: Use get_unaligned_be24()
arch/c6x/include/asm/unaligned.h | 65 +------------------- drivers/nvme/host/rdma.c | 8 --- drivers/nvme/target/rdma.c | 6 -- drivers/scsi/scsi_trace.c | 6 +- drivers/scsi/st.c | 4 +- drivers/usb/gadget/function/f_mass_storage.c | 1 + drivers/usb/gadget/function/storage_common.h | 5 -- include/linux/unaligned/be_byteshift.h | 6 +- include/linux/unaligned/generic.h | 46 ++++++++++++++ include/linux/unaligned/le_byteshift.h | 6 +- include/target/target_core_backend.h | 6 -- 11 files changed, 58 insertions(+), 101 deletions(-)
PATCH v3 1/5 linux/unaligned/byteshift.h: Remove superfluous casts
The C language supports implicitly casting a void pointer into a non-void pointer. Remove explicit void pointer to non-void pointer casts because these are superfluous.
--- include/linux/unaligned/be_byteshift.h | 6 +++--- include/linux/unaligned/le_byteshift.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
include/linux/unaligned/be_byteshift.h +3 -3
@@ -40,17 +40,17 @@ static inline void __put_unaligned_be64(u64 val, u8 *p)static inline u16 get_unaligned_be16 (const void *p) { -return __get_unaligned_be16 ((const u8 *)p); +return __get_unaligned_be16 (p); }static inline u32 get_unaligned_be32 (const void *p) { -return __get_unaligned_be32 ((const u8 *)p); +return __get_unaligned_be32 (p); }static inline u64 get_unaligned_be64 (const void *p) { -return __get_unaligned_be64 ((const u8 *)p); +return __get_unaligned_be64 (p); }static inline void put_unaligned_be16 (u16 val,void *p)
include/linux/unaligned/le_byteshift.h +3 -3
@@ -40,17 +40,17 @@ static inline void __put_unaligned_le64(u64 val, u8 *p)static inline u16 get_unaligned_le16 (const void *p) { -return __get_unaligned_le16 ((const u8 *)p); +return __get_unaligned_le16 (p); }static inline u32 get_unaligned_le32 (const void *p) { -return __get_unaligned_le32 ((const u8 *)p); +return __get_unaligned_le32 (p); }static inline u64 get_unaligned_le64 (const void *p) { -return __get_unaligned_le64 ((const u8 *)p); +return __get_unaligned_le64 (p); }static inline void put_unaligned_le16 (u16 val,void *p)
PATCH v3 2/5 c6x: Include <linux/unaligned/generic.h> instead of duplicating it
In reply to Bart Van AsscheUse the generic __{get,put}_unaligned_[bl]e() definitions instead of duplicating these. Since a later patch will add more definitions into <linux/unaligned/generic.h>, this patch ensures that these definitions have to be added only once. See also commit a7f626c1948a ("C6X: headers"). See also commit 6510d41954dc ("kernel: Move arches to use common unaligned access").
--- arch/c6x/include/asm/unaligned.h | 65 +------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-)
arch/c6x/include/asm/unaligned.h +1 -64
@@ -10,6 +10,7 @@#define _ASM_C6X_UNALIGNED_H#include <linux/swab.h> +#include <linux/unaligned/generic.h> /* * The C64x+ can do unaligned word and dword accesses in hardware
@@ -100,68 +101,4 @@ static inline void put_unaligned64(u64 val, const void *p)#endif -/* -* Cause a link-time error if we try an unaligned access other than -* 1,2,4 or 8 bytes long -*/ -extern int __bad_unaligned_access_size (void ); - -#define __get_unaligned_le (ptr) (typeof(*(ptr)))({ \ - sizeof(*(ptr)) == 1 ? *(ptr) : \ - (sizeof(*(ptr)) == 2 ? get_unaligned_le16((ptr)) : \ - (sizeof(*(ptr)) == 4 ? get_unaligned_le32((ptr)) : \ - (sizeof(*(ptr)) == 8 ? get_unaligned_le64((ptr)) : \ - __bad_unaligned_access_size()))); \ - }) - -#define __get_unaligned_be (ptr) (__force typeof(*(ptr)))({ \ - sizeof(*(ptr)) == 1 ? *(ptr) : \ - (sizeof(*(ptr)) == 2 ? get_unaligned_be16((ptr)) : \ - (sizeof(*(ptr)) == 4 ? get_unaligned_be32((ptr)) : \ - (sizeof(*(ptr)) == 8 ? get_unaligned_be64((ptr)) : \ - __bad_unaligned_access_size()))); \ - }) - -#define __put_unaligned_le (val, ptr) ({ \ - void *__gu_p = (ptr); \ - switch (sizeof(*(ptr))) { \ - case 1: \ - *(u8 *)__gu_p = (__force u8)(val); \ - break; \ - case 2: \ - put_unaligned_le16((__force u16)(val), __gu_p); \ - break; \ - case 4: \ - put_unaligned_le32((__force u32)(val), __gu_p); \ - break; \ - case 8: \ - put_unaligned_le64((__force u64)(val), __gu_p); \ - break; \ - default: \ - __bad_unaligned_access_size(); \ - break; \ - } \ - (void)0; }) - -#define __put_unaligned_be (val, ptr) ({ \ - void *__gu_p = (ptr); \ - switch (sizeof(*(ptr))) { \ - case 1: \ - *(u8 *)__gu_p = (__force u8)(val); \ - break; \ - case 2: \ - put_unaligned_be16((__force u16)(val), __gu_p); \ - break; \ - case 4: \ - put_unaligned_be32((__force u32)(val), __gu_p); \ - break; \ - case 8: \ - put_unaligned_be64((__force u64)(val), __gu_p); \ - break; \ - default: \ - __bad_unaligned_access_size(); \ - break; \ - } \ - (void)0; }) -#endif /* _ASM_C6X_UNALIGNED_H */
Re: [PATCH v3 2/5] c6x: Include <linux/unaligned/generic.h> instead of duplicating it
Quoted 6 lines · Bart Van Assche
Use the generic __{get,put}_unaligned_[bl]e() definitions instead of duplicating these. Since a later patch will add more definitions into <
linux/unaligned/generic.h>, this patch ensures that these definitions have to be added only once. See also commita7f626c1948a("C6X: headers"). See also commit6510d41954dc("kernel: Move arches to use common unaligned access").
Looks good,
PATCH v3 3/5 treewide: Consolidate {get,put}_unaligned_[bl]e24() definitions
In reply to Bart Van AsscheMove the get_unaligned_be24(), get_unaligned_le24() and put_unaligned_le24() definitions from various drivers into include/linux/unaligned/generic.h. Add a put_unaligned_be24() implementation.
--- drivers/nvme/host/rdma.c | 8 ---- drivers/nvme/target/rdma.c | 6 --- drivers/usb/gadget/function/f_mass_storage.c | 1 + drivers/usb/gadget/function/storage_common.h | 5 --- include/linux/unaligned/generic.h | 46 ++++++++++++++++++++ include/target/target_core_backend.h | 6 --- 6 files changed, 47 insertions(+), 25 deletions(-)
drivers/nvme/host/rdma.c +0 -8
@@ -142,14 +142,6 @@ static void nvme_rdma_recv_done(struct ib_cq *cq, struct ib_wc *wc);static const struct blk_mq_ops nvme_rdma_mq_ops;static const struct blk_mq_ops nvme_rdma_admin_mq_ops; -/* XXX: really should move to a generic header sooner or later.. */ -static inline void put_unaligned_le24 (u32 val,u8 *p) -{ - *p++ = val; - *p++ = val >>8 ; - *p++ = val >>16 ; -} -static inline int nvme_rdma_queue_idx (struct nvme_rdma_queue *queue) {return queue - queue->ctrl->queues;
drivers/nvme/target/rdma.c +0 -6
@@ -143,12 +143,6 @@ static int num_pages(int len)return 1 + (((len -1 ) &PAGE_MASK ) >>PAGE_SHIFT ); } -/* XXX: really should move to a generic header sooner or later.. */ -static inline u32 get_unaligned_le24 (const u8 *p) -{ -return (u32 )p[0 ] | (u32 )p[1 ] <<8 | (u32 )p[2 ] <<16 ; -} -static inline bool nvmet_rdma_need_data_in (struct nvmet_rdma_rsp *rsp) { return nvme_is_write(rsp->req.cmd) &&
drivers/usb/gadget/function/f_mass_storage.c +1 -0
@@ -216,6 +216,7 @@#include <linux/freezer.h> #include <linux/module.h> #include <linux/uaccess.h> +#include <asm/unaligned.h> #include <linux/usb/ch9.h> #include <linux/usb/gadget.h>
drivers/usb/gadget/function/storage_common.h +0 -5
@@ -172,11 +172,6 @@ enum data_direction {DATA_DIR_NONE }; -static inline u32 get_unaligned_be24 (u8 *buf) -{ -return 0xffffff & (u32 )get_unaligned_be32 (buf -1 ); -} -static inline struct fsg_lun *fsg_lun_from_dev (struct device *dev) { return container_of(dev, struct fsg_lun, dev);
include/linux/unaligned/generic.h +46 -0
56 lines not on this page · raw message
include/target/target_core_backend.h +0 -6
@@ -116,10 +116,4 @@ static inline bool target_dev_configured(struct se_device *se_dev) return !!(se_dev->dev_flags & DF_CONFIGURED); } -/* Only use get_unaligned_be24() if reading p - 1 is allowed. */ -static inline uint32_t get_unaligned_be24 (const uint8_t *const p) -{ -return get_unaligned_be32 (p -1 ) &0xffffffU ; -} -#endif /* TARGET_CORE_BACKEND_H */
PATCH v3 4/5 scsi/st: Use get_unaligned_be24() and sign_extend32()
In reply to Bart Van AsscheUse these functions instead of open-coding them.
--- drivers/scsi/st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/st.c +2 -2
@@ -45,6 +45,7 @@ static const char *verstr = "20160209";#include <linux/uaccess.h> #include <asm/dma.h> +#include <asm/unaligned.h> #include <scsi/scsi.h> #include <scsi/scsi_dbg.h>
@@ -2680,8 +2681,7 @@ static void deb_space_print(struct scsi_tape *STp, int direction, char *units, uif (!debugging)return ; - sc = cmd[2 ] &0x80 ?0xff000000 :0 ; - sc |= (cmd[2 ] <<16 ) | (cmd[3 ] <<8 ) | cmd[4 ]; + sc =sign_extend32 (get_unaligned_be24 (&cmd[2 ]),23 );if (direction) sc = -sc; st_printk(ST_DEB_MSG, STp, "Spacing tape %s over %d %s.\n",
Re: [PATCH v3 4/5] scsi/st: Use get_unaligned_be24() and sign_extend32()
Looks good,
PATCH v3 5/5 scsi/trace: Use get_unaligned_be24()
In reply to Bart Van AsscheThis makes the SCSI tracing code slightly easier to read.
--- drivers/scsi/scsi_trace.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/scsi_trace.c +2 -4
@@ -18,11 +18,9 @@ static const char * scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -u32 lba =0 , txlen; +u32 lba, txlen; - lba |= ((cdb[1 ] &0x1F ) <<16 ); - lba |= (cdb[2 ] <<8 ); - lba |= cdb[3 ]; + lba =get_unaligned_be24 (&cdb[1 ]) &0x1fffff ;/* * From SBC-2: a TRANSFER LENGTH field set to zero specifies that 256 * logical blocks shall be read (READ(6)) or written (WRITE(6)).
Martin K. Petersen
AppliedBart,
Quoted 4 lines
This patch series moves the existing {get,put}_unaligned_[bl]e24() definitions into
include/linux/unaligned/generic.hand also replaces some open-coded implementations of these functions with calls to these functions. Please consider this patch series for kernel version v5.7.
Applied to 5.7/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering