From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964889AbWJJBgS (ORCPT ); Mon, 9 Oct 2006 21:36:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751979AbWJJBgS (ORCPT ); Mon, 9 Oct 2006 21:36:18 -0400 Received: from dsl027-180-168.sfo1.dsl.speakeasy.net ([216.27.180.168]:21734 "EHLO sunset.davemloft.net") by vger.kernel.org with ESMTP id S1751305AbWJJBgR (ORCPT ); Mon, 9 Oct 2006 21:36:17 -0400 Date: Mon, 09 Oct 2006 18:36:07 -0700 (PDT) Message-Id: <20061009.183607.63736982.davem@davemloft.net> To: simoneau@ele.uri.edu Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [sparc64] 2.6.18 unaligned accesses in eth1394 From: David Miller In-Reply-To: <20061005211543.GA18539@ele.uri.edu> References: <20061005211543.GA18539@ele.uri.edu> X-Mailer: Mew version 4.2 on Emacs 21.4 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Will Simoneau Date: Thu, 5 Oct 2006 17:15:44 -0400 > The first one I seem to be able to fix by adding a get_unaligned() at > lines 1679-1680 of eth1394.c around eth->h_dest; the second one seems to > be triggered by this code: Right. > (gdb) list *ether1394_data_handler+0x914 > 0xc94 is in ether1394_data_handler (drivers/ieee1394/eth1394.c:1264). > 1259 priv->stats.rx_dropped++; > 1260 dev_kfree_skb_any(skb); > 1261 goto bad_proto; > 1262 } > 1263 > 1264 if (netif_rx(skb) == NET_RX_DROP) { > 1265 priv->stats.rx_errors++; > 1266 priv->stats.rx_dropped++; > 1267 goto bad_proto; > 1268 } Actually, I think this one is in eth1394_parse_encap(). Can you test this patch and tell me if it makes both unaligned access problems go away? Thanks. diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c index 8a7b8fa..78abb9b 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c @@ -64,6 +64,7 @@ #include #include #include #include +#include #include #include "config_roms.h" @@ -894,6 +895,7 @@ static inline u16 ether1394_parse_encap( u16 maxpayload; struct eth1394_node_ref *node; struct eth1394_node_info *node_info; + __be64 guid; /* Sanity check. MacOSX seems to be sending us 131 in this * field (atleast on my Panther G5). Not sure why. */ @@ -902,8 +904,9 @@ static inline u16 ether1394_parse_encap( maxpayload = min(eth1394_speedto_maxpayload[sspd], (u16)(1 << (max_rec + 1))); + guid = get_unaligned(&arp1394->s_uniq_id); node = eth1394_find_node_guid(&priv->ip_node_list, - be64_to_cpu(arp1394->s_uniq_id)); + be64_to_cpu(guid)); if (!node) { return 0; } @@ -1675,8 +1678,9 @@ #endif if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF]) priv->bc_dgl++; } else { + __be64 guid = get_unaligned((u64 *)eth->h_dest); node = eth1394_find_node_guid(&priv->ip_node_list, - be64_to_cpu(*(u64*)eth->h_dest)); + be64_to_cpu(guid)); if (!node) { ret = -EAGAIN; goto fail;