From owner-p4-projects@FreeBSD.ORG Sat May 9 01:38:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5C710656C3; Sat, 9 May 2009 01:38:20 +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 08A5710656B5 for ; Sat, 9 May 2009 01:38:20 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBC768FC14 for ; Sat, 9 May 2009 01:38:19 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n491cJZI058417 for ; Sat, 9 May 2009 01:38:19 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n491cJJo058415 for perforce@freebsd.org; Sat, 9 May 2009 01:38:19 GMT (envelope-from zec@fer.hr) Date: Sat, 9 May 2009 01:38:19 GMT Message-Id: <200905090138.n491cJJo058415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 161799 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, 09 May 2009 01:38:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=161799 Change 161799 by zec@zec_tpx32 on 2009/05/09 01:37:53 Add a mbuf flag for recording when an mbuf get handed over from one vnet to another. This will primarily be used to avoid LORs / deadlocks when mbuf resulting from a write on a socket in one vnet gets looped back in the opposite direction in another vnet. Affected files ... .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#9 (text+ko) ==== @@ -200,6 +200,7 @@ #define M_PROTO7 0x00100000 /* protocol-specific */ #define M_PROTO8 0x00200000 /* protocol-specific */ #define M_FLOWID 0x00400000 /* flowid is valid */ +#define M_XVNET 0x00800000 /* mbuf crossed from one vnet to another */ /* * For RELENG_{6,7} steal these flags for limited multiple routing table * support. In RELENG_8 and beyond, use just one flag and a tag. @@ -219,7 +220,7 @@ */ #define M_COPYFLAGS \ (M_PKTHDR|M_EOR|M_RDONLY|M_PROTOFLAGS|M_SKIP_FIREWALL|M_BCAST|M_MCAST|\ - M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_FIB) + M_FRAG|M_FIRSTFRAG|M_LASTFRAG|M_VLANTAG|M_PROMISC|M_FIB|M_XVNET) /* * External buffer types: identify ext_buf type.