openssh bugs - Nov 2010 - [Bug 1838] New: /proc/self/oom_adj needs to use /proc/self/oom_score_adj

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

           Summary: /proc/self/oom_adj needs to use
                    /proc/self/oom_score_adj
           Product: Portable OpenSSH
           Version: 5.6p1
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: minor
          Priority: P2
         Component: sshd
        AssignedTo: unassigned-bugs at mindrot.org
        ReportedBy: rientjes at google.com


/proc/self/oom_adj is deprecated in Linux 2.6.36 and later kernels; it
is scheduled for removal in August 2012.

sshd uses this interface to disable oom killing.

The new interface to use is /proc/self/oom_score_adj.  Instead of
writing -17 to /proc/self/oom_adj, sshd should now write -1000 to
/proc/self/oom_score_adj for the same behavior.

The filename and OOM_ADJ_NOKILL needs to be changed in
openbsd-compat/port-linux.c for 2.6.36 and later kernels.

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

David Rientjes <rientjes at google.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |rientjes at google.com

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

--- Comment #1 from Darren Tucker <dtucker at zip.com.au> 2010-11-16
16:24:22 EST ---
Created attachment 1957
  --> https://bugzilla.mindrot.org/attachment.cgi?id=1957
openssh-linux-new-oomkill.patch

Try new OOM interface first then fall back if necessary.  Tested only
on 2.6.32.

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Elias Pipping <pipping at exherbo.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |pipping at exherbo.org

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Darren Tucker <dtucker at zip.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |dtucker at zip.com.au
             Blocks|                            |1803

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Darren Tucker <dtucker at zip.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Attachment #1957|0                           |1
           is patch|                            |
   Attachment #1957|                            |ok?(djm at mindrot.org)
              Flags|                            |

--- Comment #2 from Darren Tucker <dtucker at zip.com.au> 2010-11-24
10:22:56 EST ---
Comment on attachment 1957
  --> https://bugzilla.mindrot.org/attachment.cgi?id=1957
openssh-linux-new-oomkill.patch

Works for me (2.6.32) but it would be nice if someone with a 2.6.36+
kernel could confirm it behaves as expected on that too.

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Damien Miller <djm at mindrot.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Attachment #1957|ok?(djm at mindrot.org)        |ok+
              Flags|                            |

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Damien Miller <djm at mindrot.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |djm at mindrot.org

--- Comment #3 from Damien Miller <djm at mindrot.org> 2010-12-18 09:31:12
EST ---
ping: Darren's patch can't go in until someone with a 2.6.36 system
tests his patch.

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Don Gray <donald.r.gray at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |donald.r.gray at gmail.com

--- Comment #4 from Don Gray <donald.r.gray at gmail.com> 2011-01-05
12:13:31 EST ---
(In reply to comment #3)
> ping: Darren's patch can't go in until someone with a 2.6.36 system
> tests his patch.
Tested on 2.6.36-ck5-r5 x86_64 openssh-5.6_p1

Error is gone from dmesg when restarting sshd.

value of /proc/$PID/oom_score_adj is -1000
value of /proc/$PID/oom_adj is -17

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Mike Frysinger <vapier at gentoo.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |vapier at gentoo.org

--- Comment #5 from Mike Frysinger <vapier at gentoo.org> 2011-01-09
09:08:10 EST ---
your oom_adjust should be static and constant, and you should be using
ARRAY_SIZE() instead of "2"

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

--- Comment #6 from Damien Miller <djm at mindrot.org> 2011-01-10 06:41:32
EST ---
The idiom we use is to have a sentinel array entry with an obvious NULL
or -1 somewhere we can test for:

for (i = 0; whatever[i].fnord != NULL; i++) ...

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Darren Tucker <dtucker at zip.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Attachment #1957|0                           |1
        is obsolete|                            |
   Attachment #1980|                            |ok?(djm at mindrot.org)
              Flags|                            |

--- Comment #7 from Darren Tucker <dtucker at zip.com.au> 2011-01-17
11:04:18 EST ---
Created attachment 1980
  --> https://bugzilla.mindrot.org/attachment.cgi?id=1980
Switched to end-of-array sentinel.

fair comments, I've changed it to use the sentinel since that's
consistent with what we do elsewhere.

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Damien Miller <djm at mindrot.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Attachment #1980|ok?(djm at mindrot.org)        |ok+
              Flags|                            |

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Darren Tucker <dtucker at zip.com.au> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED

--- Comment #8 from Darren Tucker <dtucker at zip.com.au> 2011-01-17
11:56:21 EST ---
Thanks, this has been committed and will be in 5.7p1.

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.

https://bugzilla.mindrot.org/show_bug.cgi?id=1838

Damien Miller <djm at mindrot.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #9 from Damien Miller <djm at mindrot.org> 2011-01-24 12:33:46
EST ---
Move resolved bugs to CLOSED after 5.7 release

-- 
Configure bugmail: https://bugzilla.mindrot.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the assignee of the bug.
You are watching someone on the CC list of the bug.