From owner-svn-src-all@freebsd.org Mon Jan 8 20:18:54 2018 Return-Path: Delivered-To: svn-src-all@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 D43B0E5EF20 for ; Mon, 8 Jan 2018 20:18:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from sonic302-36.consmr.mail.gq1.yahoo.com (sonic302-36.consmr.mail.gq1.yahoo.com [98.137.68.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AFBF471E6F for ; Mon, 8 Jan 2018 20:18:54 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1515442733; bh=IXOnRaga6Kz0tUV0s9PivkXdauWg6Ns6jiUL+zpiKjg=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From:Subject; b=fe1oN27GNz4Q8jLFpMv6liZsN1fQOldICEdmoyxhhQ6TfXrnukr0b+LFiXl8VU6W6ckwHvHVS+oQ31qzEt7vtj11t1vk0NyYBTxJ5Bbm5CcoNrg582cKnReRUaGesselLnxO4VMw8j4lfXge3nkKQUyUxic4/rwiDScl/H9csBQGvkaaZANqwJrbgNQ/eB9qU7vTdmUF7T5YPWi1Vt2Z5DN5KQTs3oIkN5WkCVPAvh5eWyeY98rSHvaq/PxPAwJ9yhQ+seraAMponLVEQJNHBRh6Czpv2XpYYlJo24pN4fSM1sTVi0qpZw1B2FHenzzgy/C4l17VzuHbFnFveId8Ew== X-YMail-OSG: uD4CU.AVM1nUTsvejlLAS4b15.dXuUh8xP6euafbnd896MPdDkxo3J0XsVrMU0A ECJ2COnjqOvcP6MU_P5d9zYb6OEzoUJUV2_AegZOySxVY6jNPM18g5A0_91NSAA1L43RI3lNATpz jQP1dwCdWkTcf550gTeNKl8zkli6hhJk5hShJqu5zrLjzkxZ2hQ.4DTn_3GFrCaDoT2r0Rt0tW9l rlktlSuBLbrtxiYresnluiwXDTd.18SWO4bfNog3nUh.i5lm4Ql4g1i3pshLj36bcW7yLIdEKQOU C4eW8zQXXXUjIcYkBtr5kDC6SOm1AAOizwlTkRXO0v737HbkhDCDFD3UY7y9Q.KDOHRzLdI9._hK 7VqNQKb1CSzyRQeDuNt35cOxNELcMIZ4zCPbyESlgHPHbwaLDZUc5Sanb3G8qdxcIuWQj8QoJC1f zyo1x7.BuhNfDw5W9A64adp2elvq4Pg60hFTZGAqZs7DGblSp_9HBDSgn3jpIa1XCRhwrQ_E. Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.gq1.yahoo.com with HTTP; Mon, 8 Jan 2018 20:18:53 +0000 Received: from smtp110.rhel.mail.gq1.yahoo.com (EHLO [192.168.0.6]) ([216.39.57.225]) by smtp415.mail.gq1.yahoo.com (JAMES SMTP Server ) with ESMTPA ID 37dde62ddfb6676b2daab4b6d9436738; Mon, 08 Jan 2018 20:18:49 +0000 (UTC) Subject: Re: svn commit: r327699 - head/sys/sys To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201801081609.w08G9941022351@pdx.rh.CN85.dnsmgr.net> From: Pedro Giffuni Organization: FreeBSD Project Message-ID: Date: Mon, 8 Jan 2018 15:18:50 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <201801081609.w08G9941022351@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 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: Mon, 08 Jan 2018 20:18:54 -0000 On 08/01/2018 11:09, Rodney W. Grimes wrote: >> Author: pfg >> Date: Mon Jan 8 15:54:29 2018 >> New Revision: 327699 >> URL: https://svnweb.freebsd.org/changeset/base/327699 >> >> Log: >> Revert r327697: >> malloc(9): drop the __result_use_check attribute for the kernel allocator. >> >> My bad: __result_use_check just checks the for the general and we always >> want to make sure allocated memory is used, not only checked for nullness. >> >> Add it to reallocf since that was missing. > Please try not to combine a revert with an add, it makes it messy > to try and figure out things in the future when only the svn log > is being used to analyze stuff as digging in mail archives becomes > painful. > > Revert, then commit the add standalone, is the better sequence in > this type of situation. Not that any of this is defined in our committers guide but IMHO "svn revert" is just a tool, pretty much as "svn move" and "svn copy". The idea is to make a committers' life easier: making two commits for such a simple change is not "easier". In this case the change is rather consistent: I added __result_use_check to the three functions that needed it. The commit log is not only clear on why the revert happened but also explains the additional one line change. When I MFC it, I will merge both changes for repository consistency but the log will basically mention that I am adding __result_use_check to reallocf(). Pedro. >> Modified: >> head/sys/sys/malloc.h >> >> Modified: head/sys/sys/malloc.h >> ============================================================================== >> --- head/sys/sys/malloc.h Mon Jan 8 15:41:49 2018 (r327698) >> +++ head/sys/sys/malloc.h Mon Jan 8 15:54:29 2018 (r327699) >> @@ -176,7 +176,7 @@ void *contigmalloc(unsigned long size, struct malloc_t >> __alloc_size(1) __alloc_align(6); >> void free(void *addr, struct malloc_type *type); >> void *malloc(unsigned long size, struct malloc_type *type, int flags) >> - __malloc_like __alloc_size(1); >> + __malloc_like __result_use_check __alloc_size(1); >> void *mallocarray(size_t nmemb, size_t size, struct malloc_type *type, >> int flags) __malloc_like __result_use_check >> __alloc_size(1) __alloc_size(2); >> @@ -187,9 +187,9 @@ void malloc_type_freed(struct malloc_type *type, unsig >> void malloc_type_list(malloc_type_list_func_t *, void *); >> void malloc_uninit(void *); >> void *realloc(void *addr, unsigned long size, struct malloc_type *type, >> - int flags) __alloc_size(2); >> + int flags) __result_use_check __alloc_size(2); >> void *reallocf(void *addr, unsigned long size, struct malloc_type *type, >> - int flags) __alloc_size(2); >> + int flags) __result_use_check __alloc_size(2); >> >> struct malloc_type *malloc_desc2type(const char *desc); >> #endif /* _KERNEL */ >> >> Pedro.