From owner-p4-projects@FreeBSD.ORG Sat Apr 19 06:52:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82B951065674; Sat, 19 Apr 2008 06:52:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44E70106566B for ; Sat, 19 Apr 2008 06:52:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34E188FC13 for ; Sat, 19 Apr 2008 06:52:36 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3J6qZFx054162 for ; Sat, 19 Apr 2008 06:52:35 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3J6qZ13054160 for perforce@freebsd.org; Sat, 19 Apr 2008 06:52:35 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 19 Apr 2008 06:52:35 GMT Message-Id: <200804190652.m3J6qZ13054160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 140243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2008 06:52:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=140243 Change 140243 by peter@peter_overcee on 2008/04/19 06:52:17 Experiment with having the compiler round up the size of struct pcpu to 64 bytes, and arrange linker layout so that the members of "struct pcpu pcpu[MAXCPU]" are each on their own L1 cache line. Affected files ... .. //depot/projects/hammer/sys/amd64/include/pcpu.h#29 edit .. //depot/projects/hammer/sys/i386/include/pcpu.h#16 edit .. //depot/projects/hammer/sys/sys/pcpu.h#18 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/pcpu.h#29 (text+ko) ==== @@ -53,6 +53,8 @@ register_t pc_fsbase; /* User values of fsbase */ \ register_t pc_gsbase /* User values of gsbase */ +#define PCPU_MD_ALIGN __aligned(64) /* use unique cache line per entry */ + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/hammer/sys/i386/include/pcpu.h#16 (text+ko) ==== @@ -57,6 +57,8 @@ u_int pc_apic_id; \ int pc_private_tss /* Flag indicating private tss */ +#define PCPU_MD_ALIGN __aligned(64) /* max cache line size */ + #ifdef lint extern struct pcpu *pcpup; ==== //depot/projects/hammer/sys/sys/pcpu.h#18 (text+ko) ==== @@ -58,6 +58,10 @@ struct rm_queue* volatile rmq_prev; }; +#ifndef PCPU_MD_ALIGN +#define PCPU_MD_ALIGN +#endif + /* * This structure maps out the global data that needs to be kept on a * per-cpu basis. The members are accessed via the PCPU_GET/SET/PTR @@ -104,7 +108,7 @@ * If only to make kernel debugging easier... */ PCPU_MD_FIELDS; -}; +} PCPU_MD_ALIGN; SLIST_HEAD(cpuhead, pcpu);