From owner-svn-src-head@freebsd.org Thu Jun 25 00:15:38 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 524D1916D5D; Thu, 25 Jun 2015 00:15:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) 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 438BD1C68; Thu, 25 Jun 2015 00:15:38 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5P0FcQj084431; Thu, 25 Jun 2015 00:15:38 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5P0FcjG084430; Thu, 25 Jun 2015 00:15:38 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201506250015.t5P0FcjG084430@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 25 Jun 2015 00:15:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284783 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2015 00:15:38 -0000 Author: mjg Date: Thu Jun 25 00:15:37 2015 New Revision: 284783 URL: https://svnweb.freebsd.org/changeset/base/284783 Log: rlimit: deduplicate code in chg* functions Modified: head/sys/kern/kern_resource.c Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Wed Jun 24 23:05:17 2015 (r284782) +++ head/sys/kern/kern_resource.c Thu Jun 25 00:15:37 2015 (r284783) @@ -1371,49 +1371,52 @@ ui_racct_foreach(void (*callback)(struct } #endif -/* - * Change the count associated with number of processes - * a given user is using. When 'max' is 0, don't enforce a limit - */ -int -chgproccnt(struct uidinfo *uip, int diff, rlim_t max) +static inline int +chglimit(struct uidinfo *uip, long *limit, int diff, rlim_t max, const char *name) { /* Don't allow them to exceed max, but allow subtraction. */ if (diff > 0 && max != 0) { - if (atomic_fetchadd_long(&uip->ui_proccnt, (long)diff) + diff > max) { - atomic_subtract_long(&uip->ui_proccnt, (long)diff); + if (atomic_fetchadd_long(limit, (long)diff) + diff > max) { + atomic_subtract_long(limit, (long)diff); return (0); } } else { - atomic_add_long(&uip->ui_proccnt, (long)diff); - if (uip->ui_proccnt < 0) - printf("negative proccnt for uid = %d\n", uip->ui_uid); + atomic_add_long(limit, (long)diff); + if (*limit < 0) + printf("negative %s for uid = %d\n", name, uip->ui_uid); } return (1); } /* + * Change the count associated with number of processes + * a given user is using. When 'max' is 0, don't enforce a limit + */ +int +chgproccnt(struct uidinfo *uip, int diff, rlim_t max) +{ + + return (chglimit(uip, &uip->ui_proccnt, diff, max, "proccnt")); +} + +/* * Change the total socket buffer size a user has used. */ int chgsbsize(struct uidinfo *uip, u_int *hiwat, u_int to, rlim_t max) { - int diff; + int diff, rv; diff = to - *hiwat; - if (diff > 0) { - if (atomic_fetchadd_long(&uip->ui_sbsize, (long)diff) + diff > max) { - atomic_subtract_long(&uip->ui_sbsize, (long)diff); - return (0); - } + if (diff > 0 && max == 0) { + rv = 0; } else { - atomic_add_long(&uip->ui_sbsize, (long)diff); - if (uip->ui_sbsize < 0) - printf("negative sbsize for uid = %d\n", uip->ui_uid); + rv = chglimit(uip, &uip->ui_sbsize, diff, max, "sbsize"); + if (rv != 0) + *hiwat = to; } - *hiwat = to; - return (1); + return (rv); } /* @@ -1424,36 +1427,14 @@ int chgptscnt(struct uidinfo *uip, int diff, rlim_t max) { - /* Don't allow them to exceed max, but allow subtraction. */ - if (diff > 0 && max != 0) { - if (atomic_fetchadd_long(&uip->ui_ptscnt, (long)diff) + diff > max) { - atomic_subtract_long(&uip->ui_ptscnt, (long)diff); - return (0); - } - } else { - atomic_add_long(&uip->ui_ptscnt, (long)diff); - if (uip->ui_ptscnt < 0) - printf("negative ptscnt for uid = %d\n", uip->ui_uid); - } - return (1); + return (chglimit(uip, &uip->ui_ptscnt, diff, max, "ptscnt")); } int chgkqcnt(struct uidinfo *uip, int diff, rlim_t max) { - if (diff > 0 && max != 0) { - if (atomic_fetchadd_long(&uip->ui_kqcnt, (long)diff) + - diff > max) { - atomic_subtract_long(&uip->ui_kqcnt, (long)diff); - return (0); - } - } else { - atomic_add_long(&uip->ui_kqcnt, (long)diff); - if (uip->ui_kqcnt < 0) - printf("negative kqcnt for uid = %d\n", uip->ui_uid); - } - return (1); + return (chglimit(uip, &uip->ui_kqcnt, diff, max, "kqcnt")); } void