From: Thierry Reding <[email protected]>
If the system was booted using a device tree and if the device tree
contains a MAC address, use it instead of reading one from the EEPROM.
This is useful in situations where the EEPROM isn't properly programmed
or where the firmware wants to override the existing MAC address.
Signed-off-by: Thierry Reding <[email protected]>
---
Applies to net-next.
Changes in v2:
- rewrite error check for readability
- initialize mac_addr array
drivers/net/ethernet/realtek/r8169.c | 36 ++++++++++++++++++----------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index e8a112149a62..501891be7c56 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7110,6 +7110,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
return pci_alloc_irq_vectors(tp->pci_dev, 1, 1, flags);
}
+static void rtl_read_mac_address(struct rtl8169_private *tp,
+ u8 mac_addr[ETH_ALEN])
+{
+ /* Get MAC address */
+ switch (tp->mac_version) {
+ case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
+ case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
+ *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
+ *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
+ break;
+ default:
+ break;
+ }
+}
+
DECLARE_RTL_COND(rtl_link_list_ready_cond)
{
return RTL_R8(tp, MCU) & LINK_LIST_RDY;
@@ -7301,6 +7316,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{
const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
+ u8 mac_addr[ETH_ALEN] __aligned(4) = {};
struct rtl8169_private *tp;
struct net_device *dev;
int chipset, region, i;
@@ -7403,20 +7419,14 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
u64_stats_init(&tp->rx_stats.syncp);
u64_stats_init(&tp->tx_stats.syncp);
- /* Get MAC address */
- switch (tp->mac_version) {
- u8 mac_addr[ETH_ALEN] __aligned(4);
- case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
- case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
- *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
- *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
+ /* get MAC address */
+ rc = eth_platform_get_mac_address(&pdev->dev, mac_addr);
+ if (rc)
+ rtl_read_mac_address(tp, mac_addr);
+
+ if (is_valid_ether_addr(mac_addr))
+ rtl_rar_set(tp, mac_addr);
- if (is_valid_ether_addr(mac_addr))
- rtl_rar_set(tp, mac_addr);
- break;
- default:
- break;
- }
for (i = 0; i < ETH_ALEN; i++)
dev->dev_addr[i] = RTL_R8(tp, MAC0 + i);
--
2.19.1
From: Thierry Reding <[email protected]>
Read MAC address 32-bit at a time and manually extract the individual
bytes. This avoids pointer aliasing and gives the compiler a better
chance of optimizing the operation.
Suggested-by: Andrew Lunn <[email protected]>
Signed-off-by: Thierry Reding <[email protected]>
---
Applies to net-next.
I tested this on a Jetson TX2 with an add-in Realtek ethernet card that
has a properly programmed OTP to verify that I got the endianess right.
Seems like everything works and the device behaves the same with or
without this patch.
drivers/net/ethernet/realtek/r8169.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 501891be7c56..192fbb36bc9f 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7113,12 +7113,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
static void rtl_read_mac_address(struct rtl8169_private *tp,
u8 mac_addr[ETH_ALEN])
{
+ u32 value;
+
/* Get MAC address */
switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
- *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
- *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
+ value = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
+ mac_addr[0] = (value >> 0) & 0xff;
+ mac_addr[1] = (value >> 8) & 0xff;
+ mac_addr[2] = (value >> 16) & 0xff;
+ mac_addr[3] = (value >> 24) & 0xff;
+
+ value = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
+ mac_addr[4] = (value >> 0) & 0xff;
+ mac_addr[5] = (value >> 8) & 0xff;
break;
default:
break;
@@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{
const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
- u8 mac_addr[ETH_ALEN] __aligned(4) = {};
+ u8 mac_addr[ETH_ALEN] = {};
struct rtl8169_private *tp;
struct net_device *dev;
int chipset, region, i;
--
2.19.1
On Mon, Feb 04, 2019 at 05:42:13PM +0100, Thierry Reding wrote:
> From: Thierry Reding <[email protected]>
>
> Read MAC address 32-bit at a time and manually extract the individual
> bytes. This avoids pointer aliasing and gives the compiler a better
> chance of optimizing the operation.
>
> Suggested-by: Andrew Lunn <[email protected]>
> Signed-off-by: Thierry Reding <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Andrew
On 04.02.2019 17:42, Thierry Reding wrote:
> From: Thierry Reding <[email protected]>
>
> Read MAC address 32-bit at a time and manually extract the individual
> bytes. This avoids pointer aliasing and gives the compiler a better
> chance of optimizing the operation.
>
> Suggested-by: Andrew Lunn <[email protected]>
> Signed-off-by: Thierry Reding <[email protected]>
> ---
> Applies to net-next.
>
> I tested this on a Jetson TX2 with an add-in Realtek ethernet card that
> has a properly programmed OTP to verify that I got the endianess right.
> Seems like everything works and the device behaves the same with or
> without this patch.
>
> drivers/net/ethernet/realtek/r8169.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index 501891be7c56..192fbb36bc9f 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -7113,12 +7113,21 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
> static void rtl_read_mac_address(struct rtl8169_private *tp,
> u8 mac_addr[ETH_ALEN])
> {
> + u32 value;
> +
> /* Get MAC address */
> switch (tp->mac_version) {
> case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38:
> case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
> - *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
> - *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
> + value = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC);
> + mac_addr[0] = (value >> 0) & 0xff;
> + mac_addr[1] = (value >> 8) & 0xff;
> + mac_addr[2] = (value >> 16) & 0xff;
> + mac_addr[3] = (value >> 24) & 0xff;
> +
> + value = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC);
> + mac_addr[4] = (value >> 0) & 0xff;
> + mac_addr[5] = (value >> 8) & 0xff;
> break;
> default:
> break;
> @@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
> static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> {
> const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
> - u8 mac_addr[ETH_ALEN] __aligned(4) = {};
> + u8 mac_addr[ETH_ALEN] = {};
> struct rtl8169_private *tp;
> struct net_device *dev;
> int chipset, region, i;
>
I just have one concern / question:
After this there's a call to is_valid_ether_addr(mac_addr) and kernel-doc of
is_valid_ether_addr() states that argument must be u16-aligned.
AFAIK that's not guaranteed for a byte array.
Heiner
On 04.02.2019 17:42, Thierry Reding wrote:
> From: Thierry Reding <[email protected]>
>
> If the system was booted using a device tree and if the device tree
> contains a MAC address, use it instead of reading one from the EEPROM.
> This is useful in situations where the EEPROM isn't properly programmed
> or where the firmware wants to override the existing MAC address.
>
> Signed-off-by: Thierry Reding <[email protected]>
Reviewed-by: Heiner Kallweit <[email protected]>
From: Thierry Reding <[email protected]>
Date: Mon, 4 Feb 2019 17:42:13 +0100
> @@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
> static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> {
> const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
> - u8 mac_addr[ETH_ALEN] __aligned(4) = {};
> + u8 mac_addr[ETH_ALEN] = {};
> struct rtl8169_private *tp;
I agree with Heiner, you have to provide at least 2 byte alignment for this
buffer due to the reasons he stated.
On Mon, 2019-02-04 at 19:20 -0800, David Miller wrote:
> From: Thierry Reding <[email protected]>
> Date: Mon, 4 Feb 2019 17:42:13 +0100
>
> > @@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
> > static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> > {
> > const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
> > - u8 mac_addr[ETH_ALEN] __aligned(4) = {};
> > + u8 mac_addr[ETH_ALEN] = {};
> > struct rtl8169_private *tp;
>
> I agree with Heiner, you have to provide at least 2 byte alignment for this
> buffer due to the reasons he stated.
It's declared after a pointer so it is already is 2 byte aligned.
A lot of drivers wouldn't work otherwise.
From: Joe Perches <[email protected]>
Date: Tue, 05 Feb 2019 10:42:54 -0800
> On Mon, 2019-02-04 at 19:20 -0800, David Miller wrote:
>> From: Thierry Reding <[email protected]>
>> Date: Mon, 4 Feb 2019 17:42:13 +0100
>>
>> > @@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
>> > static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
>> > {
>> > const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
>> > - u8 mac_addr[ETH_ALEN] __aligned(4) = {};
>> > + u8 mac_addr[ETH_ALEN] = {};
>> > struct rtl8169_private *tp;
>>
>> I agree with Heiner, you have to provide at least 2 byte alignment for this
>> buffer due to the reasons he stated.
>
> It's declared after a pointer so it is already is 2 byte aligned.
>
> A lot of drivers wouldn't work otherwise.
That's assuming a lot about what the compiler will do when it allocates
local variables to the stack.
I want it _explicit_.
On Tue, 2019-02-05 at 11:14 -0800, David Miller wrote:
> From: Joe Perches <[email protected]>
> Date: Tue, 05 Feb 2019 10:42:54 -0800
>
> > On Mon, 2019-02-04 at 19:20 -0800, David Miller wrote:
> >> From: Thierry Reding <[email protected]>
> >> Date: Mon, 4 Feb 2019 17:42:13 +0100
> >>
> >> > @@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
> >> > static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> >> > {
> >> > const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
> >> > - u8 mac_addr[ETH_ALEN] __aligned(4) = {};
> >> > + u8 mac_addr[ETH_ALEN] = {};
> >> > struct rtl8169_private *tp;
> >>
> >> I agree with Heiner, you have to provide at least 2 byte alignment for this
> >> buffer due to the reasons he stated.
> >
> > It's declared after a pointer so it is already is 2 byte aligned.
> >
> > A lot of drivers wouldn't work otherwise.
>
> That's assuming a lot about what the compiler will do when nit allocates
> local variables to the stack.
It's also assuming what a compiler will do when
it defines a struct.
> I want it _explicit_.
Your choice, but there are a _lot_ of existing uses
and I think requiring it is as senseless as requiring
void * arithmetic to be cast to char * as gcc and
clang already do not add padding after a pointer.
On 02/05/2019 10:42 AM, Joe Perches wrote:
>
> It's declared after a pointer so it is already is 2 byte aligned.
>
> A lot of drivers wouldn't work otherwise.
Maybe these drivers are only used on arches where this does not matter.
On Tue, 2019-02-05 at 12:04 -0800, Eric Dumazet wrote:
>
> On 02/05/2019 10:42 AM, Joe Perches wrote:
> > It's declared after a pointer so it is already is 2 byte aligned.
> >
> > A lot of drivers wouldn't work otherwise.
>
> Maybe these drivers are only used on arches where this does not matter.
Possible.
I had only grepped through the sources looking for
declarations using:
$ git grep -B1 '\[ETH_ALEN\];' -- '*.c' | grep -A1 '\*'
It's quite a few files in net/ too btw.
I still think adding __align(<even#>) is unnecessary here unless
it follows something like a bool or a u8.
On 05.02.2019 21:18, Joe Perches wrote:
> On Tue, 2019-02-05 at 12:04 -0800, Eric Dumazet wrote:
>>
>> On 02/05/2019 10:42 AM, Joe Perches wrote:
>>> It's declared after a pointer so it is already is 2 byte aligned.
>>>
>>> A lot of drivers wouldn't work otherwise.
>>
>> Maybe these drivers are only used on arches where this does not matter.
>
> Possible.
>
> I had only grepped through the sources looking for
> declarations using:
>
> $ git grep -B1 '\[ETH_ALEN\];' -- '*.c' | grep -A1 '\*'
>
> It's quite a few files in net/ too btw.
>
> I still think adding __align(<even#>) is unnecessary here unless
> it follows something like a bool or a u8.
>
>
I there's such a controversy, then it may be better to stay with
the current code, or?
On 02/05/2019 12:18 PM, Joe Perches wrote:
> I still think adding __align(<even#>) is unnecessary here unless
> it follows something like a bool or a u8.
This would be some historical side effect, and we do not want to rely on that.
A security feature could in fact ask a compiler to perform random
shuffling of automatic variables.
( a la __randomize_layout )
On Tue, 2019-02-05, Joe Perches wrote:
> On Tue, 2019-02-05 at 12:04 -0800, Eric Dumazet wrote:
>>
>> On 02/05/2019 10:42 AM, Joe Perches wrote:
>> > It's declared after a pointer so it is already is 2 byte aligned.
>> >
>> > A lot of drivers wouldn't work otherwise.
>>
>> Maybe these drivers are only used on arches where this does not matter.
>
> Possible.
>
> I had only grepped through the sources looking for
> declarations using:
>
> $ git grep -B1 '\[ETH_ALEN\];' -- '*.c' | grep -A1 '\*'
>
> It's quite a few files in net/ too btw.
>
> I still think adding __align(<even#>) is unnecessary here unless
> it follows something like a bool or a u8.
Um, guys, this is practically C-101.
From C99, 6.7.2.1:
> 13/ Within a structure object, the non-bit-field members and the units in
> which bit-fields reside have addresses that increase in the order in which
> they are declared. A pointer to a structure object, suitably converted,
> points to its initial member (or if that member is a bit-field, then to the
> unit in which it resides), and vice versa. There may be unnamed padding
> within a structure object, but not at its beginning.
AFAIK there is no such language in the spec regarding variable layout on
the stack. So Joe, you are totally off-base here.
-- Paul
On Tue, 2019-02-05 at 19:27 -0700, Paul Zimmerman wrote:
> On Tue, 2019-02-05, Joe Perches wrote:
> > On Tue, 2019-02-05 at 12:04 -0800, Eric Dumazet wrote:
> > > On 02/05/2019 10:42 AM, Joe Perches wrote:
> > > > It's declared after a pointer so it is already is 2 byte aligned.
> > > >
> > > > A lot of drivers wouldn't work otherwise.
> > >
> > > Maybe these drivers are only used on arches where this does not matter.
> >
> > Possible.
> >
> > I had only grepped through the sources looking for
> > declarations using:
> >
> > $ git grep -B1 '\[ETH_ALEN\];' -- '*.c' | grep -A1 '\*'
> >
> > It's quite a few files in net/ too btw.
> >
> > I still think adding __align(<even#>) is unnecessary here unless
> > it follows something like a bool or a u8.
>
> Um, guys, this is practically C-101.
>
> From C99, 6.7.2.1:
>
> > 13/ Within a structure object, the non-bit-field members and the units in
> > which bit-fields reside have addresses that increase in the order in which
> > they are declared. A pointer to a structure object, suitably converted,
> > points to its initial member (or if that member is a bit-field, then to the
> > unit in which it resides), and vice versa. There may be unnamed padding
> > within a structure object, but not at its beginning.
>
> AFAIK there is no such language in the spec regarding variable layout on
> the stack. So Joe, you are totally off-base here.
We're not talking about the spec, see the void * arithmetic
bit, we're talking about what gcc and clang actually do.
This spec regarding variable layout structure members could
also apply to any of the unpacked protocol headers like in
include/uapi/linux/ip.h (struct iphdr for instance)
So, it's not me that's off here.
I do understand the c90 spec pretty well.
Eric's comment about stack layout randomization certainly applies.
Perhaps it's reasonable to add some __aligned(<even#>) to the
appropriate [ETH_ALEN] declarations.
On Tue, 05 Feb 2019 18:52:18 -0800, Joe Perches <[email protected]> wrote:
> On Tue, 2019-02-05 at 19:27 -0700, Paul Zimmerman wrote:
>> On Tue, 2019-02-05, Joe Perches wrote:
>>> On Tue, 2019-02-05 at 12:04 -0800, Eric Dumazet wrote:
>>> > On 02/05/2019 10:42 AM, Joe Perches wrote:
>>> > > It's declared after a pointer so it is already is 2 byte aligned.
>>> > >
>>> > > A lot of drivers wouldn't work otherwise.
>>> >
>>> > Maybe these drivers are only used on arches where this does not matter.
>>>
>>> Possible.
>>>
>>> I had only grepped through the sources looking for
>>> declarations using:
>>>
>>> $ git grep -B1 '\[ETH_ALEN\];' -- '*.c' | grep -A1 '\*'
>>>
>>> It's quite a few files in net/ too btw.
>>>
>>> I still think adding __align(<even#>) is unnecessary here unless
>>> it follows something like a bool or a u8.
>>
>> Um, guys, this is practically C-101.
>>
>> From C99, 6.7.2.1:
>>
>> > 13/ Within a structure object, the non-bit-field members and the units in
>> > which bit-fields reside have addresses that increase in the order in which
>> > they are declared. A pointer to a structure object, suitably converted,
>> > points to its initial member (or if that member is a bit-field, then to the
>> > unit in which it resides), and vice versa. There may be unnamed padding
>> > within a structure object, but not at its beginning.
>>
>> AFAIK there is no such language in the spec regarding variable layout on
>> the stack. So Joe, you are totally off-base here.
>
> We're not talking about the spec, see the void * arithmetic
> bit, we're talking about what gcc and clang actually do.
Sorry, I see I was a bit unclear. In an earlier message, which I neglected
to quote, you said:
> It's declared after a pointer so it is already is 2 byte aligned.
> A lot of drivers wouldn't work otherwise.
But it's declared after a pointer *on the stack* (local variable), not in
a structure. I was trying to say that there is nothing in the C spec that
says that local variables have any kind of ordering guarantee, unlike struct
members. And I have never seen any kernel code that relies on the ordering
of local variables to work correctly.
I used to work a lot with low-level C/assembly code, and I know for a fact
that GCC does not lay out stack variables in the same order that they are
declared.
-- Paul
On Tue, 2019-02-05 at 20:25 -0700, Paul Zimmerman wrote:
> GCC does not lay out stack variables in the same order that they are
> declared.
True. Most stack variables could be assigned to a register.
cheers, Joe
On Tue, Feb 05, 2019 at 11:19:04AM -0800, Joe Perches wrote:
> On Tue, 2019-02-05 at 11:14 -0800, David Miller wrote:
> > From: Joe Perches <[email protected]>
> > Date: Tue, 05 Feb 2019 10:42:54 -0800
> >
> > > On Mon, 2019-02-04 at 19:20 -0800, David Miller wrote:
> > >> From: Thierry Reding <[email protected]>
> > >> Date: Mon, 4 Feb 2019 17:42:13 +0100
> > >>
> > >> > @@ -7316,7 +7325,7 @@ static int rtl_get_ether_clk(struct rtl8169_private *tp)
> > >> > static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> > >> > {
> > >> > const struct rtl_cfg_info *cfg = rtl_cfg_infos + ent->driver_data;
> > >> > - u8 mac_addr[ETH_ALEN] __aligned(4) = {};
> > >> > + u8 mac_addr[ETH_ALEN] = {};
> > >> > struct rtl8169_private *tp;
> > >>
> > >> I agree with Heiner, you have to provide at least 2 byte alignment for this
> > >> buffer due to the reasons he stated.
> > >
> > > It's declared after a pointer so it is already is 2 byte aligned.
> > >
> > > A lot of drivers wouldn't work otherwise.
> >
> > That's assuming a lot about what the compiler will do when nit allocates
> > local variables to the stack.
>
> It's also assuming what a compiler will do when
> it defines a struct.
This is not a structure member, it's a local variable. I'm not aware of
any C norm requirement for ordering of local variables on the stack.
After all, some of them might not be on the stack at all and use only
registers or be optimized out completely.
Michal Kubecek