block: aoe: replace use of __constant_htons to htons
Subsystems (2)
PATCH 1/1 block: aoe: replace use of __constant_htons to htons
The macro htons expands to __swab16 which has special case for constants in little endian case. In big endian case both __constant_htons and htons macros expand to the same code. So, replace __constant_htons with htons to get rid of the definition of __constant_htons completely.
--- drivers/block/aoe/aoecmd.c | 2 +- drivers/block/aoe/aoenet.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/block/aoe/aoecmd.c +1 -1
@@ -69,7 +69,7 @@ new_skb(ulong len)skb_reserve (skb,MAX_HEADER );skb_reset_mac_header (skb);skb_reset_network_header (skb); - skb->protocol =__constant_htons (ETH_P_AOE ); + skb->protocol =htons (ETH_P_AOE );skb_checksum_none_assert (skb); }return skb;
drivers/block/aoe/aoenet.c +1 -2
@@ -192,7 +192,7 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, }static struct packet_type aoe_pt__read_mostly = { - .type =__constant_htons (ETH_P_AOE ), + .type =htons (ETH_P_AOE ), .func = aoenet_rcv, };
@@ -220,4 +220,3 @@ aoenet_exit(void)skb_queue_purge (&skbtxq);dev_remove_pack (&aoe_pt); } -
--
2.29.2
From: Amey Narkhede
Quoted 9 lines
Sent: 20 December 2020 16:46
The macro htons expands to
__swab16which has special case for constants in little endian case. In big endian case both__constant_htonsand htons macros expand to the same code. So, replace__constant_htonswith htons to get rid of the definition of__constant_htonscompletely.
...
drivers/block/aoe/aoenet.c aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, · line 196
Quoted 4 lines
static struct
packet_typeaoe_pt__read_mostly= {drivers/block/aoe/aoenet.c +1
-1- .type = __constant_htons(ETH_P_AOE), + .type = htons(ETH_P_AOE), .func = aoenet_rcv,
Does this cause grief if someone is doing a COMPILE_TEST on LE?
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Quoted 58 lines · David Laight
From: 'Amey Narkhede' <[email protected]>
Quoted 29 lines
Sent: 20 December 2020 20:20
To: David Laight <[email protected]>
Subject: Re: [PATCH] block: aoe: replace use of__constant_htonsto htonsQuoted 18 lines · David Laight
From: Amey Narkhede
Quoted 9 lines
Sent: 20 December 2020 16:46
The macro htons expands to
__swab16which has special case for constants in little endian case. In big endian case both__constant_htonsand htons macros expand to the same code. So, replace__constant_htonswith htons to get rid of the definition of__constant_htonscompletely....
drivers/block/aoe/aoenet.c aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, · line 196
Quoted 4 lines
static struct
packet_typeaoe_pt__read_mostly= {drivers/block/aoe/aoenet.c +1
-1- .type = __constant_htons(ETH_P_AOE), + .type = htons(ETH_P_AOE), .func = aoenet_rcv,Does this cause grief if someone is doing a
COMPILE_TESTon LE?Quoted 6 lines
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)Quoted 5 lines
I did
COMPILE_TESTon myx86_64machine and it compiled without any problems.
I assume that was the point or am I missing something? I'm a beginner contributor so please let me know if there any mistakes.It depends on exactly how the bswap functions are defined.
You can't have anything that contains a function call (or asm) for a static initialiser or case label.
The bswap functions have used thebuiltin_constant()check to switch between an asm block and C expression.
So the C expression is used for constants - so evaluated by the compiler, and the asm for variables.
Last I looked this wasn't valid for initialisers - so the__constant_bswap()exists for these cases.Now, it might be that, on more recent gcc
__builtin_bswap()is used. This might be valid for constants in initialisers. Whether the same is true for CLANG is another issue.Basically it is all complex and partially historic.
So you may need to use
__constant_htons()for initialisers
and case labels.
For constants in code it doesn't matter whether you use the__constantform. For variables in code the__constantform is likely to generate horrid code.
Quoted 8 lines
FWIW you'll get more credit for finding real bugs than stylistic changes.
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Thanks for thee detail explanation. Actually I was submitting stylistic changes to get familiar with email and patch based workflows
Amey