From owner-svn-src-all@FreeBSD.ORG  Mon Feb  9 02:31:28 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7558C7AF;
 Mon,  9 Feb 2015 02:31:28 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 614722B6;
 Mon,  9 Feb 2015 02:31:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t192VSFs060752;
 Mon, 9 Feb 2015 02:31:28 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t192VS6C060751;
 Mon, 9 Feb 2015 02:31:28 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201502090231.t192VS6C060751@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 9 Feb 2015 02:31:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278431 - head/sys/contrib/vchiq/interface/vchiq_arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 02:31:28 -0000

Author: gonzo
Date: Mon Feb  9 02:31:27 2015
New Revision: 278431
URL: https://svnweb.freebsd.org/changeset/base/278431

Log:
  Do not mark shared structures as __packed, it leads to race condition
  
  If structure packed as __packed clang (and probably gcc) generates
  code that loads word fields (e.g. tx_pos)  byte-by-byte and if it's
  modified by VideoCore in the same time as ARM loads the value result
  is going to be mixed combination of bytes from previous value and
  new one.

Modified:
  head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h

Modified: head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h
==============================================================================
--- head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h	Mon Feb  9 02:27:33 2015	(r278430)
+++ head/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h	Mon Feb  9 02:31:27 2015	(r278431)
@@ -280,7 +280,7 @@ typedef struct vchiq_slot_info_struct {
 	/* Use two counters rather than one to avoid the need for a mutex. */
 	short use_count;
 	short release_count;
-} __packed VCHIQ_SLOT_INFO_T; /* XXXGONZO: check it */
+}  VCHIQ_SLOT_INFO_T;
 
 typedef struct vchiq_service_struct {
 	VCHIQ_SERVICE_BASE_T base;
@@ -381,7 +381,7 @@ typedef struct vchiq_shared_state_struct
 
 	/* Debugging state */
 	int debug[DEBUG_MAX];
-} __packed VCHIQ_SHARED_STATE_T;
+} VCHIQ_SHARED_STATE_T;
 
 typedef struct vchiq_slot_zero_struct {
 	int magic;
@@ -395,7 +395,7 @@ typedef struct vchiq_slot_zero_struct {
 	VCHIQ_SHARED_STATE_T master;
 	VCHIQ_SHARED_STATE_T slave;
 	VCHIQ_SLOT_INFO_T slots[VCHIQ_MAX_SLOTS];
-} __packed VCHIQ_SLOT_ZERO_T;
+} VCHIQ_SLOT_ZERO_T;
 
 struct vchiq_state_struct {
 	int id;