From owner-svn-src-all@freebsd.org Tue Dec 17 14:53:56 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65FFB1EA64C; Tue, 17 Dec 2019 14:53:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47ch3m22X5z4Qg9; Tue, 17 Dec 2019 14:53:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 408B0F92B; Tue, 17 Dec 2019 14:53:56 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBHEruNb011569; Tue, 17 Dec 2019 14:53:56 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBHEruLG011568; Tue, 17 Dec 2019 14:53:56 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201912171453.xBHEruLG011568@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 17 Dec 2019 14:53:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355855 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 355855 X-SVN-Commit-Repository: base 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.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2019 14:53:56 -0000 Author: mjg Date: Tue Dec 17 14:53:55 2019 New Revision: 355855 URL: https://svnweb.freebsd.org/changeset/base/355855 Log: Convert zpcpu_* inlines to macros and add zpcpu_replace. This allows them to do basic type casting internally, effectively relieving consumers from having to cast on their own. Modified: head/sys/sys/pcpu.h Modified: head/sys/sys/pcpu.h ============================================================================== --- head/sys/sys/pcpu.h Tue Dec 17 11:03:32 2019 (r355854) +++ head/sys/sys/pcpu.h Tue Dec 17 14:53:55 2019 (r355855) @@ -228,28 +228,30 @@ extern struct pcpu *cpuid_to_pcpu[]; #define curproc (curthread->td_proc) /* Accessor to elements allocated via UMA_ZONE_PCPU zone. */ -static inline void * -zpcpu_get(void *base) -{ +#define zpcpu_get(base) ({ \ + __typeof(base) _ptr = (void *)((char *)(base) + UMA_PCPU_ALLOC_SIZE * curcpu); \ + _ptr; \ +}) - return ((char *)(base) + UMA_PCPU_ALLOC_SIZE * curcpu); -} +#define zpcpu_get_cpu(base, cpu) ({ \ + __typeof(base) _ptr = (void *)((char *)(base) + UMA_PCPU_ALLOC_SIZE * cpu); \ + _ptr; \ +}) -static inline void * -zpcpu_get_cpu(void *base, int cpu) -{ - - return ((char *)(base) + UMA_PCPU_ALLOC_SIZE * cpu); -} - /* * This operation is NOT atomic and does not post any barriers. * If you use this the assumption is that the target CPU will not * be modifying this variable. * If you need atomicity use xchg. * */ +#define zpcpu_replace(base, val) ({ \ + __typeof(val) _old = *(__typeof(base))zpcpu_get(base); \ + *(__typeof(val) *)zpcpu_get(base) = val; \ + _old; \ +}) + #define zpcpu_replace_cpu(base, val, cpu) ({ \ - __typeof(val) _old = *(__typeof(val) *)zpcpu_get_cpu(base, cpu);\ + __typeof(val) _old = *(__typeof(base))zpcpu_get_cpu(base, cpu); \ *(__typeof(val) *)zpcpu_get_cpu(base, cpu) = val; \ _old; \ })